TRUNK-4242: SonarQube - Return statements should not occur in finally blocks
Merge pull request #591 from mszukalski/TRUNK-4242

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