Move the released file lock to the successful path

Instead of logging that the lock was released even
if there was an error that caused it not to be
unreleased we should only log that it was released
after it really was.

Change-Id: Id3f37b801a1d5efd2dcb4a9803989df50a36e7de
Merge "Move the released file lock to the successful path"