[Merge] lp:~hopem/nova/icehouse-lp1506257 into lp:~ubuntu-server-dev/nova/icehouse

[Corey Bryant]

Thanks Ed. I merged the diff from launchpad instead since the changelog signature had a different time stamp.  https://launchpadlibrarian.net/222055256/nova_1%3A2014.1.5-0ubuntu1.3_1%3A2014.1.5-0ubuntu1.4.diff.gz
-- 
https://code.launchpad.net/~hopem/nova/icehouse-lp1506257/+merge/274493
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~hopem/nova/icehouse-lp1506257 into lp:~ubuntu-server-dev/nova/icehouse.