[openstack-packstack/f19] (7 commits) ...Merge branch 'el6-grizzly'