SAK-18760 : Update master to tomcat 7
SAK-18760 : Update master to tomcat 7


git-svn-id: 663088ded5def2f533e0afefcd57025a4c9430d9@98855 66ffb92e-73f9-0310-93c1-f5514f145a0a

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