Squashed commit of the following:

commit 125c48377f2be2f3e9be92b6cbb5956f692deea2
Author: RashmiDR <rashmi@datatorrent.com>
Date:   Wed Nov 27 14:54:22 2013 -0800

    applying review findings to fix issue #316 issue #317