Minor fixes for /servers page
Merge branch 'master' into lxc-support
Merge branch 'lxc-support' into testing