[Merge] lp:~xianghui/ubuntu/trusty/neutron/lp1393391 into lp:ubuntu/trusty-proposed/neutron

[Xiang Hui]

@Serge,

Thanks for looking at it, added the dep3 header.
-- 
https://code.launchpad.net/~xianghui/ubuntu/trusty/neutron/lp1393391/+merge/280943
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~xianghui/ubuntu/trusty/neutron/lp1393391 into lp:ubuntu/trusty-proposed/neutron.