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

* commit '0000e1c82e630fbda525619d837beec065a950bf':
  delete orphaned and obsolete files