Merge branch 'smadmin-optimizations' into 'master'

Added index keys to accounting_summary table to speedup lookups

See merge request !424
3 jobs for master in 3 minutes and 21 seconds (queued for 1 second)