Merge "Clean up HEAT health check script" into beijing