Merge branch 'SLING-10386_2' of https://github.com/apache/sling-org-apache-sling-feature-cpconverter into SLING-10386_2