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

JAVA-1523
Not sure I agree with the default! and as people wont use both there shouldn't be any confusion but it seems its already set as a convention.