Clean up how connection_args are treated

This doesn't really affect the cloudi services - its more to keep the code-bases in sync...