Merge branch 'master' of...

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/indexer-service into fix-integer-parsing

 Conflicts:
	testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java
	testing/indexer-test-core/src/main/resources/features/indexrecord/indexRecord-schema-service.feature