Patches for JCR-2129 and JCR-2138

[Martijn Hendriks]

Hi,

Issues JCR-2129 and JCR-2138 have small patches attached that, however, touch 
core functionality. It would be great if someone could find some time to have a 
look. Thanks!

Best regards,
Martijn Hendriks