Commiting patch for externalizing health checks in 1.5