Signed-off-by: Sarath Subramanian <ssubramanian@hortonworks.com> (cherry picked from commit 8967f0cf62cae4c6d6215a7fb4fc0b1d7bac9789)
