TRUNK-4242: SonarQube - Return statements should not occur in finally bl...