am b59cf565: am e205386e: am 66e965dd: am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev

* commit 'b59cf5659da6279a977282fc39c0c2c3a3dd9f37':
  delete orphaned and obsolete files