Merge branch 'fix-white-source-issues' of https://community.opengroup.org/osdu/platform/data-flow/enrichment/wks into fix-white-source-issues