# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyGlobalHttpHandler.java