Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Fix Sonar's "Generic exceptions should never be thrown"
  Collapse "if" statements to reduce method complexity
  Remove redundant parentheses
  Remove redundant toString

Change-Id: Id241f6b145fb47cf5218c1ce14cc2b34bea3c1cc