Fixed some exceptions on shutdown
More fixes for map reduce group by support
Merge branch 'master' of github.com:vzhabiuk/sensei