Fixes UMD2 problem and some CREAM issues

This now can deploy a CREAM CE. 
Still need to fix munge