Find and Modify now use returnOriginal as per spec

JAVA-1523