RANGER-1124: Fixes for CID#s 131473, 150594, 150789

Signed-off-by: Velmurugan Periasamy <vel@apache.org>
(cherry picked from commit 09b52b939bcd957be7e5a6a85a138c0fee29f9df)
3 files changed