heat template clean up
Merge branch 'master' of https://github.com/hdansou/webpagetest

Conflicts:
	heat/webpagetest-private-single.yaml