Merge remote-tracking branch 'origin/master'

operation_manager/src/main/resources/application-sit.properties

@@ -1,4 +1,4 @@
-server.port=8325
+server.port=8326
 spring.application.name=operation-manager
 logging.level.root=info
 logging.path=./logs/operation-manager