Squashed commit of the following:

commit 36faa3385498670c0708b697e32d3f2c27877f84
Author: RashmiDR <rashmi@datatorrent.com>
Date:   Wed Apr 16 15:50:48 2014 -0700

    fixesApp