Lowered high lock timeout in mergeViaLock() and lock() in BagOStuff

Change-Id: Ib5cd0a98ce6ec47edb24f8cc9f4df2c941ce1c38