Refactor mavconn #1229

Job	Run time
industrial_ci (rolling, testing)	16m 6s
industrial_ci (jazzy, main)	15m 55s
industrial_ci (humble, main)	15m 5s
industrial_ci (kilted, main)	16m 46s
	1h 3m 52s

Provide feedback