Santity check before cleanup of locks directory
Fix a compilation error and remove obsolete test for bundle context with empty persistent storage location