Add deployment tag to TSDB metrics on Heartbeats

Signed-off-by: John Tuley <jtuley@pivotallabs.com>
Fix hanging spec [#62866980]

Signed-off-by: John Tuley <jtuley@pivotallabs.com>
Merge pull request #488 into develop

Signed-off-by: Jesse Zhang <jz@pivotallabs.com>
Drop an unnecessary early return.

Signed-off-by: Jesse Zhang <jz@pivotallabs.com>