[Merge] lp:~cjohnston/horizon/icehouse-1308651 into lp:~ubuntu-server-dev/horizon/icehouse

[Corey Bryant]

Review: Approve

Thanks Chris.  Looks good to me and I've tested with the patch successfully.
-- 
https://code.launchpad.net/~cjohnston/horizon/icehouse-1308651/+merge/235978
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~cjohnston/horizon/icehouse-1308651 into lp:~ubuntu-server-dev/horizon/icehouse.