2.0.x backport1

For jiras SHDP-365, SHDP-373, SHDP-374 and SHDP-375