Merge pull request #1 from bosschaert/SLING-7496

SLING-7496 - Fix two failures in ConfigInstallTest