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

* commit '2377da025abafe367359d8b2d9d1fecb615f7733':
  delete orphaned and obsolete files