[Merge] lp:~cbjchen/nova/kilo-sru-lp1457517 into lp:~ubuntu-server-dev/nova/juno

[Sebastien Bacher]

changing to work in progress then (to get out of the ubuntu sponsoring queue)
-- 
https://code.launchpad.net/~cbjchen/nova/kilo-sru-lp1457517/+merge/268339
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~cbjchen/nova/kilo-sru-lp1457517 into lp:~ubuntu-server-dev/nova/juno.