Update hostmaster exceptions.
Merge branch 'refs/heads/master' into cluster