This was done already, see referenced bug. -- https://code.launchpad.net/~corey.bryant/keystone/2014.1.4/+merge/253695 Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~corey.bryant/keystone/2014.1.4 into lp:~ubuntu-server-dev/keystone/icehouse.