Some cleanup of EncryptionUtil

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>
Remove unused exceptions

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>
Just curly braces...

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>
Merge branch 'sonarbugs' into dev