Merge COMP2013, subsystems, vm config backup