Merge branch 'spring-fox-upgrade' of...

Merge branch 'spring-fox-upgrade' of https://community.opengroup.org/osdu/platform/system/indexer-service into spring-fox-upgrade

# Conflicts:
#	indexer-core/src/main/java/org/opengroup/osdu/indexer/swagger/SwaggerDocumentationConfig.java