Merge "Tweaked some of the default LockManager ttls"