953848 - adding custom info to system breaks further manipulation
with that system
Merge pull request #2028 from komidore64/953848_custom_info

953848 - adding custom info to system breaks further manipulation
removing uneeded javascript, which broke manifest import
fixing small js mistake
Merge pull request #2086 from jlsherrill/import_fix

removing uneeded javascript, which broke manifest import UI
Merging content view definition api tests
957193 - Fixed a user perm issue where verbs were getting eating

User.allowed_to?(READ_PERM_VERBS, :providers, nil, org)
this call modified READ_PERM_VERBS.
[:create, :read, :update] will get transformed to [:read, :update]
"No tag" verbs like :create will get eaten.
Future checks on if it was "create enabled" will return false
The net result is they get *less* permissions than they should.

 This fix addresses that issue.
Merge pull request #2091 from daviddavis/temp_1366988588

Merging content view def api tests
Merge pull request #2092 from parthaa/957193

957193 - Fixed a user perm issue where verbs were getting eaten
asynchronous default_info info apply in the CLI