re-enable test case, correct merge conflict #4974

Job	Run time
check-formating	1m 27s
unit-tests	5m 51s
build-operator-image	2m 4s
vulnerability-scan	51s
smoke-tests (basic)	58m 16s
smoke-tests (appframeworksS1)	1h 20m 30s
smoke-tests (managerappframeworkc3)	2h 43m 24s
smoke-tests (managerappframeworkm4)	1h 37m 59s
smoke-tests (managersecret)	1h 26m 19s
smoke-tests (managermc)	1h 17m 4s
push-latest	0s
	9h 33m 45s

Provide feedback