Merged changes on openlava branch (openlava launch calls backed out)