Merge branch 'check_server_brokering'

Change-Id: Icef04f7b9e068007caabd2dfdeb35edb9e9a9b1a
Workers won't expire when heartbeating on same second as server does.

If a worker send a heart-beat at 5sec 59ms and the server recieves it
at 5sec 59ms, and than ticks over to 6sec when getting the local time, we
incorrectly kill valid workers.

Change-Id: I1ee398f98a61ff4a5114e99b28a05428e472065e
Correct more shadow warnings.

Change-Id: I11c11e90fcaa266f12465e4dd9e5c14e49327eca
Merge branch 'shadow_warnings'

Change-Id: I3ae4e16d1bc606d9da5a8af27a5761570c56b680