Merge branch 'master' of https://github.com/apache/iotdb

Merge branch 'master' of https://github.com/apache/iotdb #558