Merge pull request #3185 from agresch/agresch_storm_3557

STORM-3557 allow health checks to pass on timeout and add meter to track