formula fixes
"pulling changes"
Merge branch 'master' of github.com:CSSCorp/openstack-automation