Squashed commit of the following:

commit fc95d9565ebd4d8b65d5c7f6025df11b919114a4
Author: RashmiDR <rashmi@datatorrent.com>
Date:   Tue Nov 26 20:23:40 2013 -0800

    applying review findings of #issue 329