[Trinidad] Commit Request for TRINIDAD-2327

[Anand Nath]

Hello,

Can someone review and commit the patch uploaded into the jira issue 
TRINIDAD-2327?

Thanks
Anand