pillar modification
Merge branch 'icehouse-json' of github.com:CSSCorp/openstack-automation into icehouse-json