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

* commit '66e965dd0fec17a87781821f7a360964a075f18f':
  delete orphaned and obsolete files