Merge changes from topic "icon-thrashing" into tm-qpr-dev

* changes:
  Fixing syntax error due to java-version changes
  Fixing icon cache thrashing due to an unsupported icon