Merge changes Id0595c4b,Ia1a3e8c3 into mnc-dev

* changes:
  Revert "Replace infinite loop with foreach."
  Update intellij project for tools-common sources.