[18.09] backport fix substitution with non-empty env-var - #1394

[18.09] backport fix substitution with non-empty env-var#1394

thaJeztah merged 1 commit into

docker:18.09docker/cli:18.09from

thaJeztah:18.09_backport_thaJeztah/cli:18.09_backport_Copy head branch name to clipboard