Support deploying the combined vm to NeCTAR
Merge branch 'master' of github.com:BCCVL/BCCVL_Test_Environment