Wire in the distributed lock
Fix NPE caused by null health code
Fix null health code
Merge pull request #397 from eric-wu/develop

minor fixes