Merge commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf' * commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf': Add a new checkin server flag for Vending Machine heartbeats.
Merge commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf' * commit 'ba6409f1f69db7dfa16d5b914d2bc41a3aa43caf': Add a new checkin server flag for Vending Machine heartbeats.