[18.09] Fix panic in display only case for license#1408

andrewhsu merged 2 commits intodocker:18.09docker/cli:18.09from

dhiltgen:fix_panicdhiltgen/cli-1:fix_panicCopy head branch name to clipboard