Fixes but 960409 and adresses review comments including removal of do-while construct
Merge pull request #4131 from karlden/findUnboundedRecursionBug960409

Fixes find functionality recursion (bugzilla FF bug 960409)