Merge "Add some indexes to allow efficient dashboard sql" into feature/zuulv3