[Trinidad] TRINIDAD-1117, TRINIDAD-923

[Martin Kočí]

Hello, 

can anybody review patchs for
https://issues.apache.org/jira/browse/TRINIDAD-1117
and 
https://issues.apache.org/jira/browse/TRINIDAD-923 and apply them if
possible?

Regards,

Martin