Find and Modify now use returnOriginal as per spec 2/2

JAVA-1523
I don't see any tests of returnOriginal(false).  Unless I'm missing them, you should add them.