CRM-15447
Merge pull request #4378 from jitendrapurohit/CRM-15447

Related test build failure is not related to current PR changes, also tested(follow issue link), hence merging