Squashed commit of the following:

commit 0f87450649ec08bd2cf3e465406636bcba148caf
Author: RashmiDR <rashmi@datatorrent.com>
Date:   Wed Feb 5 14:57:10 2014 -0800

    directory scan operator fixes #MLHR-321