Merge "Update Heat enviroment HPA parameters"