Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev