Merge branch 'dev'
Move MaintenanceVmGemServer to Seaside project