[18.09] Refine how metadata dir is handled#1388

andrewhsu merged 1 commit intodocker:18.09docker/cli:18.09from

dhiltgen:revamp_18.09dhiltgen/cli-1:revamp_18.09Copy head branch name to clipboard