Updated openstack/openstack
Project: openstack/sahara  b615cd69170949526e424abc0caeb62f5274e9ce

Merge tag '2014.2'

Sahara 2014.2

Change-Id: I482d15a9566e0587b6e38daa01e655bd24b04590