HCOLL-256 added JIRA number -"Maps containing Value as char[], get() returns too many char[]'s"
Merge remote-tracking branch 'origin/master'