o cleanup after merge
o cleanup after merge

git-svn-id: d3061b52f177ba403f02f0a296a85518da96c313@1396668 13f79535-47bb-0310-9956-ffa450edef68

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