merge r384693 from branch - fix compilation issue
merge r384693 from branch - fix compilation issue


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

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