PTP: Fix old delta making us not lock when we are the GM. Fix lock delta calculation.
Merge remote-tracking branch 'msli-origin/integration-test' into Release_2.0_Dev_Branch