Merge remote-tracking branch 'apache/trunk' into HDDS-48