Fixed loading modResource derivatives based on objects allowListingInClassKeyDropdown setting, not using showInContextMenu for that
Fix loading modResource derivatives in class_key dropdown

Merge remote-tracking branch 'origin/pr/625' into release-2.2

* origin/pr/625:
  Fixed loading modResource derivatives based on objects allowListingInClassKeyDropdown setting, not using showInContextMenu for that
Remove executable bit from files
[#10211] Fix parser state bug triggered by media sources

Fix state issue with modParser::$_removingUnprocessed and modParser::$_processingUncacheable being triggered by processing of media source properties. May have other triggers as well.
Removing Bower from Listed Dependencies

Bower doesn't needed to be installed through npm to use grunt-bower
Increase modTransportPackage version columns range to smallint

Prevents out-of-range errors with version_major, version_minor, version_patch or release_index values involving integers greater than 255
Merge branch 'release-2.2' into develop

* release-2.2:
  Increase modTransportPackage version columns range to smallint
  [#10211] Fix parser state bug triggered by media sources
  Remove executable bit from files
  Fixed loading modResource derivatives based on objects allowListingInClassKeyDropdown setting, not using showInContextMenu for that

Conflicts:
	core/docs/changelog.txt
Add 2.2.10-pl db upgrades to 2.3.0-rc1 db upgrade
Implement UserGroup Settings
Add settings tab to security/group/update
Fix joins in modUser::getUserGroupSettings()
Add changelog
[#9484] Add User Group Settings

Merge branch 'group-settings' into develop

* group-settings:
  Add changelog
  Fix joins in modUser::getUserGroupSettings()
  Add settings tab to security/group/update
  Implement UserGroup Settings
Fix modUser::getSettings() error

when modUser::getUserGroupSettings() returns data (expected array of modUserGroupSetting objects but is actually returning array of associative key -> value settings)
Fixed actions for grinds in system info causing empty error window
Fixed media source's paths to processors
Merge remote-tracking branch 'origin/pr/631' into develop
Fixed media source's paths to processors

Merge remote-tracking branch 'origin/pr/633' into develop

* origin/pr/633:
  Fixed media source's paths to processors
Fix empty error message on system info page

Merge remote-tracking branch 'origin/pr/635' into develop

* origin/pr/635:
  Fixed actions for grinds in system info causing empty error window