use new heartbeat-lock

Signed-off-by: Alex Suraci <asuraci@pivotallabs.com>