Merge branch 'develop' of git.osuosl.org:ganeti/ganeti_webmgr into develop