Implements USERGRID-205

Fixes ordering issue with signaling death before saving job status
Merge branch 'add-metrics' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into import-pooja