Merge branch 'mitaka_dev' into 'master'

manifests/params.pp

manifests/profile/ceilometer/common.pp

manifests/profile/ceilometer/controller.pp

manifests/profile/cinder.pp

manifests/profile/glance.pp

manifests/profile/keystone.pp

manifests/profile/neutron/client.pp

manifests/profile/neutron/common.pp

manifests/profile/neutron/router.pp

manifests/profile/neutron/routeroncontroller.pp

manifests/profile/neutron/server.pp

manifests/profile/nova/common.pp

manifests/profile/nova/compute.pp

manifests/profile/nova/controller.pp

manifests/role/compute.pp

manifests/role/controller.pp

manifests/role/controllerandnetwork.pp

manifests/role/network.pp

manifests/role/rhmk.pp

templates/openrc.erb