Merge branch 'master' into spork2
more sporking
so much sporking
Merge pull request #1079 from shackbarth/spork2

disable billing extension
Issue #21992: Removed Inventory
re-enable billing
generalize adding privs in prep_database
spork is the official term
generalize model-creation helpers
issue 21986: most basic test coverage for project type workflow
Include port in root URL.
bumped to 1.5.0
Merge tag 'v1.5.0'

v1.5.0
Update RELEASE.md

removed extraneous chars
Add memory cache of Discovery Route query results.
Merge branch 'discovery_cache' into new_21190
Cache discovery based on the requested URL as this can change.
Merge branch 'discovery_cache' into new_21190
Add unique function to Array proto do concat can be used.
Add support to plv8 Discover to pass multiple orms as an array and get subset of resources.