Merge branch 'release/v1.1.0'
Merge branch 'release/v1.2.0'
Updated with soainfra schema details
Merge branch 'master' into develop

Conflicts:
	puppet/hieradata/primary.developer.com.yaml