This uses more modern formatting to handle the lockfiles and control
file cleanup with try/finally, taking advantage of the previous
extra indentation.
(From OE-Core rev: 9cd7c2631b0840a57b9ed6c201bcb4fc80094f71)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>