[18.09 backport] fix annotations on --template-driver - #1788

[18.09 backport] fix annotations on --template-driver#1788

andrewhsu merged 2 commits into

docker:18.09docker/cli:18.09from

thaJeztah:18.09_backport_annotationsthaJeztah/cli:18.09_backport_annotationsCopy head branch name to clipboard