🔧 fix merge problems on rebase #151

Job	Run time
GS64 v3.7.1 + Application-Configuration	26s
GS64 v3.7.0 + Application-Configuration	32s
GS64 v3.7.1 + Application-Control	27s
GS64 v3.7.0 + Application-Control	36s
GS64 v3.7.1 + Application-Info	37s
GS64 v3.7.0 + Application-Info	28s
GS64 v3.7.1 + Core	24s
GS64 v3.7.0 + Core	28s
GS64 v3.7.1 + Dependent-SUnit-Extensions	28s
GS64 v3.7.0 + Dependent-SUnit-Extensions	45s
GS64 v3.7.1 + Deployment	26s
GS64 v3.7.0 + Deployment	34s
GS64 v3.7.1 + Examples	42s
GS64 v3.7.0 + Examples	38s
GS64 v3.7.1 + HealthCheck	23s
GS64 v3.7.0 + HealthCheck	28s
GS64 v3.7.1 + Metrics	24s
GS64 v3.7.0 + Metrics	30s
GS64 v3.7.1 + JSON-RPC	28s
GS64 v3.7.0 + JSON-RPC	31s
	10m 15s

Provide feedback