SAK-25287 Reverse-merging r130409
SAK-25287 Reverse-merging r130409

git-svn-id: 291858a59550e5d8b06c9cd35f5f6835be0ab041@130412 66ffb92e-73f9-0310-93c1-f5514f145a0a

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