merging from branch
merging from branch

git-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@368989 13f79535-47bb-0310-9956-ffa450edef68

gorcz/maven,vedmishr/demo1,mizdebsk/maven,lbndev/maven,changbai1980/maven,karthikjaps/maven,Mounika-Chirukuri/maven,rogerchina/maven,cstamas/maven,dsyer/maven,barthel/maven,josephw/maven,gorcz/maven,keith-turner/maven,Distrotech/maven,kidaa/maven-1,ChristianSchulte/maven,aheritier/maven,runepeter/maven-deploy-plugin-2.8.1,skitt/maven,mcculls/maven,vedmishr/demo1,dsyer/maven,vedmishr/demo1,trajano/maven,wangyuesong0/maven,wangyuesong/maven,skitt/maven,wangyuesong/maven,changbai1980/maven,pkozelka/maven,stephenc/maven,rogerchina/maven,xasx/maven,gorcz/maven,stephenc/maven,stephenc/maven,Mounika-Chirukuri/maven,olamy/maven,wangyuesong0/maven,aheritier/maven,njuneau/maven,lbndev/maven,aheritier/maven,atanasenko/maven,mcculls/maven,josephw/maven,likaiwalkman/maven,olamy/maven,Tibor17/maven,apache/maven,apache/maven,cstamas/maven,karthikjaps/maven,kidaa/maven-1,josephw/maven,runepeter/maven-deploy-plugin-2.8.1,wangyuesong0/maven,karthikjaps/maven,mcculls/maven,olamy/maven,mizdebsk/maven,njuneau/maven,trajano/maven,likaiwalkman/maven,atanasenko/maven,kidaa/maven-1,Distrotech/maven,keith-turner/maven,lbndev/maven,Tibor17/maven,keith-turner/maven,ChristianSchulte/maven,xasx/maven,changbai1980/maven,ChristianSchulte/maven,atanasenko/maven,barthel/maven,dsyer/maven,likaiwalkman/maven,pkozelka/maven,njuneau/maven,xasx/maven,rogerchina/maven,skitt/maven,Mounika-Chirukuri/maven,pkozelka/maven,mizdebsk/maven,wangyuesong/maven,barthel/maven,trajano/maven,cstamas/maven,apache/maven