SAK-25569 reverse merge the inadvertent change to the pom.xml
SAK-25569 reverse merge the inadvertent change to the pom.xml


git-svn-id: 5b1b1b0f989bbd918ddd0a77f47569c690fd24bc@134290 66ffb92e-73f9-0310-93c1-f5514f145a0a

bkirschn/sakai,conder/sakai,whumph/sakai,ouit0408/sakai,lorenamgUMU/sakai,puramshetty/sakai,kwedoff1/sakai,introp-software/sakai,wfuedu/sakai,puramshetty/sakai,noondaysun/sakai,lorenamgUMU/sakai,noondaysun/sakai,bzhouduke123/sakai,frasese/sakai,puramshetty/sakai,clhedrick/sakai,liubo404/sakai,introp-software/sakai,duke-compsci290-spring2016/sakai,ktakacs/sakai,hackbuteer59/sakai,bkirschn/sakai,introp-software/sakai,willkara/sakai,conder/sakai,tl-its-umich-edu/sakai,zqian/sakai,udayg/sakai,udayg/sakai,udayg/sakai,tl-its-umich-edu/sakai,kingmook/sakai,liubo404/sakai,lorenamgUMU/sakai,colczr/sakai,colczr/sakai,noondaysun/sakai,zqian/sakai,noondaysun/sakai,lorenamgUMU/sakai,willkara/sakai,ouit0408/sakai,wfuedu/sakai,zqian/sakai,puramshetty/sakai,tl-its-umich-edu/sakai,buckett/sakai-gitflow,ouit0408/sakai,tl-its-umich-edu/sakai,buckett/sakai-gitflow,pushyamig/sakai,bkirschn/sakai,buckett/sakai-gitflow,pushyamig/sakai,whumph/sakai,zqian/sakai,joserabal/sakai,bzhouduke123/sakai,bzhouduke123/sakai,puramshetty/sakai,introp-software/sakai,surya-janani/sakai,lorenamgUMU/sakai,joserabal/sakai,willkara/sakai,willkara/sakai,clhedrick/sakai,joserabal/sakai,wfuedu/sakai,kwedoff1/sakai,ktakacs/sakai,conder/sakai,colczr/sakai,wfuedu/sakai,udayg/sakai,conder/sakai,wfuedu/sakai,udayg/sakai,liubo404/sakai,liubo404/sakai,whumph/sakai,surya-janani/sakai,bkirschn/sakai,frasese/sakai,noondaysun/sakai,zqian/sakai,buckett/sakai-gitflow,noondaysun/sakai,rodriguezdevera/sakai,duke-compsci290-spring2016/sakai,lorenamgUMU/sakai,frasese/sakai,whumph/sakai,conder/sakai,rodriguezdevera/sakai,wfuedu/sakai,conder/sakai,whumph/sakai,duke-compsci290-spring2016/sakai,clhedrick/sakai,bkirschn/sakai,bkirschn/sakai,ouit0408/sakai,ktakacs/sakai,bzhouduke123/sakai,OpenCollabZA/sakai,introp-software/sakai,puramshetty/sakai,OpenCollabZA/sakai,buckett/sakai-gitflow,kwedoff1/sakai,liubo404/sakai,surya-janani/sakai,whumph/sakai,buckett/sakai-gitflow,introp-software/sakai,conder/sakai,hackbuteer59/sakai,ouit0408/sakai,pushyamig/sakai,tl-its-umich-edu/sakai,frasese/sakai,duke-compsci290-spring2016/sakai,hackbuteer59/sakai,frasese/sakai,joserabal/sakai,kwedoff1/sakai,willkara/sakai,kwedoff1/sakai,joserabal/sakai,liubo404/sakai,introp-software/sakai,Fudan-University/sakai,pushyamig/sakai,ktakacs/sakai,udayg/sakai,bkirschn/sakai,OpenCollabZA/sakai,kwedoff1/sakai,udayg/sakai,ktakacs/sakai,wfuedu/sakai,buckett/sakai-gitflow,OpenCollabZA/sakai,whumph/sakai,joserabal/sakai,duke-compsci290-spring2016/sakai,lorenamgUMU/sakai,surya-janani/sakai,noondaysun/sakai,colczr/sakai,kwedoff1/sakai,kwedoff1/sakai,bzhouduke123/sakai,bzhouduke123/sakai,bzhouduke123/sakai,willkara/sakai,surya-janani/sakai,hackbuteer59/sakai,kingmook/sakai,Fudan-University/sakai,rodriguezdevera/sakai,joserabal/sakai,colczr/sakai,Fudan-University/sakai,duke-compsci290-spring2016/sakai,Fudan-University/sakai,surya-janani/sakai,surya-janani/sakai,kingmook/sakai,noondaysun/sakai,rodriguezdevera/sakai,puramshetty/sakai,zqian/sakai,hackbuteer59/sakai,frasese/sakai,clhedrick/sakai,puramshetty/sakai,tl-its-umich-edu/sakai,surya-janani/sakai,Fudan-University/sakai,colczr/sakai,whumph/sakai,bkirschn/sakai,hackbuteer59/sakai,pushyamig/sakai,introp-software/sakai,frasese/sakai,kingmook/sakai,Fudan-University/sakai,rodriguezdevera/sakai,colczr/sakai,willkara/sakai,OpenCollabZA/sakai,liubo404/sakai,ktakacs/sakai,zqian/sakai,kingmook/sakai,duke-compsci290-spring2016/sakai,OpenCollabZA/sakai,rodriguezdevera/sakai,tl-its-umich-edu/sakai,tl-its-umich-edu/sakai,pushyamig/sakai,zqian/sakai,clhedrick/sakai,joserabal/sakai,frasese/sakai,rodriguezdevera/sakai,duke-compsci290-spring2016/sakai,clhedrick/sakai,OpenCollabZA/sakai,lorenamgUMU/sakai,OpenCollabZA/sakai,buckett/sakai-gitflow,colczr/sakai,ouit0408/sakai,Fudan-University/sakai,bzhouduke123/sakai,hackbuteer59/sakai,clhedrick/sakai,ouit0408/sakai,hackbuteer59/sakai,pushyamig/sakai,willkara/sakai,ktakacs/sakai,ktakacs/sakai,Fudan-University/sakai,clhedrick/sakai,kingmook/sakai,pushyamig/sakai,wfuedu/sakai,rodriguezdevera/sakai,ouit0408/sakai,kingmook/sakai,udayg/sakai,liubo404/sakai,kingmook/sakai,conder/sakai