[jira] (TRINIDAD-2188) (TRINIDAD-2172) - Please commit.

[Anand Nath]

Hello,

Can some one review and commit this fix for (TRINIDAD-2172) and 
(TRINIDAD-2188)?

Thanks
Anand