Lock subversion fix

This is extracted from #687.

This fixes #report_failure and #report_success from causing the unlock not to occur during #enable and #disable.