Fixed M2 build
Fixed M2 build


git-svn-id: 89b32b378de00f5ffd299c3e6f8b346627a4782e@20756 66ffb92e-73f9-0310-93c1-f5514f145a0a

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