Get unit tests running green.
Sync up unit test changes with 1.7.

Merge branch 'jruby-1_7'

Conflicts:
	core/pom.xml
	core/src/test/java/org/jruby/embed/ReaderInputStreamTest.java
	core/src/test/java/org/jruby/embed/ScriptingContainerTest.java