Merge changes I392b1c44,I3584db40,If8f46a37,Ib2bf4d6e

* changes:
  sonar code smells fix- Remove the declaration of thrown exception, as it cannot be thrown from method's body
  sonar code smells fix- Use the primitive boolean expression here
  sonar security issue fix- Make sure that hashing data is safe here
  sonar code smells fix- Format specifiers should be used instead of string concatenation