Fix bad copy from branch
Merge pull request #197 from andylyall/2014.05

Fix bad copy from branch
Rename some HealthCheck options
Fix Javadoc
Merge pull request #198 from andylyall/2014.05

2014.05