Merge branch '20200806-10000' of gitlab.freemud.com:order-group-application/order-group into develop

# Conflicts:
#	order-application-service/pom.xml