Merge "Clean up script for OOF HEAT based deployment"