Fixed some bugs related with collation_connection
Merge branch 'master' of git@github.com:projectestac/agora