A few patches to fix dependency issues with Organizations.

@mattdrayer @martynjames This PR should fix the biggest share of the issues I was sending you.

The Organizations app needs to be added to the bokchoy environment JSON in order to make sure bokchoy can run, as this app appears to be required by default now. But adding it in also makes the work by one of the tests to modify the database redundant. When running the tests after this change, the schema change causes failures all along down the line after a certain point. This patch fixes that by removing the custom DB changes and allowing the inclusion of ORGANIZATIONS_APP in the features list to handle it.

Please let me know of any feedback as soon as you can. Merging this in will make test failures clearer for a PR I need to review. Thanks in advance! @antoviaque @e-kolpakov