minor cleanups and fixes#569

vvoland merged 4 commits into

docker:masterdocker/docker-install:masterfrom

thaJeztah:cleanup_verthaJeztah/docker-install:cleanup_verCopy head branch name to clipboard