Merge "Move files to make eclipse-java happy" into jb-mr1-dev