Merge "Spurious file removed." into jb-mr2-dev