[See https://www.elastic.co/blog/dear-search-guard-users for background

https://jenkins.onap.org/view/aai-search-data-service/job/aai-search-data-service-searchguard-maven-docker-stage-master/71/ is failing ]

This issue is being cloned from original issue AAi-2617 to allow for a new commit to be added for Master branch.

This issue is to allow for port of https://gerrit.onap.org/r/c/aai/search-data-service/+/96354 to the master branch.