Fixes to EUCA-4728 Adjust determining whether partitioned.lock is needed