Merge branch 'osp-11'

Conflicts:
	20-overcloud-images.yml
	31-overcloud-templates.yml