DE2979 category nodes evaluate their enabled and auth status based on aggregate of children nodes
DE2979 evaluating checkable and ischecked status separately for categories and edorgs
DE2979 initial ATs passed
DE2979 additional AT added to feature
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979

Conflicts:
	sli/admin-tools/admin-rails/lib/edorg_tree_helper.rb
re US5985 go down the path of making the SecurityEventResource inherit from UnversionedResource again to get more default behavior
DE2979 - integrated changes from hinsdale to support category checkboxes responding correctly to deselection of child nodes. update ATs.
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979
Merge branch 'master' into DE2979

Conflicts:
	sli/admin-tools/admin-rails/lib/edorg_tree_helper.rb
Merge branch 'master' into us5985
re US5985 make it possible to specify the name of a different service than the BasicService (which currently must be a subclass of BasicService and take the same constructor parameters) when building an EntityDefinition
re US5985 make all private member variables and member functions of BasicService protected so that subclasses can implement things differently
re US5985 add a custom service for security events and declare that we will be using it for the security event entity in the BasicDefinitionStore
re US5985 note a brittle way to construct a location that appears to assoume that all resources are versioned (which not all are)
re US5985 give read access to DefaultResource.onePartTemplate and DefaultResource.twoPartTemplate to subclasses (write access was already there)
re US5985 also mock a parameterless form of UriInfo.getQueryParameters()