asdf:
Merge branch 'automation' of github.com:echohead/incubator into automation

Conflicts:
	tripleo-localrc