DP-205 Forward merging HDFS-3733 and HDFS-4505

Merged patches for HDFS-3733 and HDFS-4505

Squashed commit of the following:

commit d32a5df9a2ba1e58edb25dedc22863f5a44a277b
Author: Abin Shahab <ashahab@altiscale.com>
Date:   Wed Nov 13 16:13:58 2013 -0800

    HDFS-3733 AE-173 patch forward merged to 2.0.5

    Done as part of DP-205

commit 1d5dcae8eac4264e72ccdaa14668a9d4223ea4a5
Author: Abin Shahab <ashahab@altiscale.com>
Date:   Wed Nov 13 16:07:53 2013 -0800

    HDFS-4505 OPS-744 patch forward merged to 2.0.5