Inclusion of GEODE-7531 and GEODE-7159 into 1.11

[Udo Kohlmeyer]

Hi there Release manager for the 1.11 release.

Please could you include

GEODE-7531, SHA: f5b59350cc1b4580154df047f409a6c7a4095f0b

and

GEODE-7159, SHA: 0f05e9ccd94c04a205ace82de6616e9bffa92fa7

into 1.11.

Regards

Udo