CONTRIB-4124 - Remove spurious calendar event code
CONTRIB-4091 - Fix for pagination when groups or groupings used
Merge branch 'master' into master_BFC