Merge branch 'branch-0.5.1' of http://192.168.1.105:6060/jinhai/milvus into branch-0.5.1

Former-commit-id: 141aae3ed35f8d978b5d1ae29c9ee6fdb1a7ed8d