Merge "delete obsolete duplicate files" into jb-mr1.1-ub-dev