SI-6918 Changes REPL output from "defined module" to "defined object"
Merge pull request #1848 from soc/SI-6918

SI-6918 Changes REPL output from "defined module" to "defined object"
Merge branch 'master' of https://github.com/scala/scala into parse-java7