Merge changes I06a74c84,I2cf9d3aa into qt-dev

* changes:
  Do not fail idmap scan if one idmap fails to generate
  Run idmap2 static-checks and fix formatting issues