GRP-1041: Add index for type_of_group and simplify some queries that depend on type_of_group.

Conflicts:

	grouper/src/grouper/edu/internet2/middleware/grouper/ddl/GrouperDdl.java