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

[Corey Bryant]

Review: Approve

Looks good to me and tests out ok. I posted a screenshot of running with the fix to bug #1396318.
-- 
https://code.launchpad.net/~cjohnston/ubuntu/trusty/horizon/1396318-icehouse/+merge/243583
Your team Ubuntu Server Developers is subscribed to branch lp:~ubuntu-server-dev/horizon/icehouse.