change HashMapStringObject to native groovy hash
Merge remote-tracking branch 'origin/master'

Conflicts:
	java-common-basic/src/test/groovy/common/basic/utils/URLUtilTest.groovy
remove unneeded comment and parameter