Merge changes I7f55717f,Iba2a5174
* changes: Bug 1514374: Fixing pagination in a number of places Bug 1515431: Missing templates for the group report page
* changes: Bug 1514374: Fixing pagination in a number of places Bug 1515431: Missing templates for the group report page