[Merge] lp:~yolanda.robla/keystone/icehouse_fix-distribution into lp:~ubuntu-server-dev/keystone/icehouse

[James Page]

Review: Abstain

This seems much more upstream-able; can we try upstream first to gauge appetite for this sort of feature?
-- 
https://code.launchpad.net/~yolanda.robla/keystone/icehouse_fix-distribution/+merge/198275
Your team Ubuntu Server Developers is subscribed to branch lp:~ubuntu-server-dev/keystone/icehouse.