HCOLL-167 remove use of StringBuffer
Merge remote-tracking branch 'origin/master'