Review for #7381 and #7347

[Mario Ivanac]

Hi all,

please could someone review:

 https://issues.apache.org/jira/browse/GEODE-9484

PR: https://github.com/apache/geode/pull/7381

and

https://issues.apache.org/jira/browse/GEODE-10020

PR: https://github.com/apache/geode/pull/7347



Thanks,
Mario