Moved cleaner to end of function to ensure that there is no double init.
Merge pull request #579 from TheNeikos/fix-connection_manager_double_deinit

Moved cleaner to end of function to ensure that there is no double init.