Merge "Remove conflicting package information for junit.runner and junit.textui"