Engine: Fixes #3325: Initial fixes to get content search UI working.
Engine: Updates to fix page loading after initial setup.
Merge pull request #3251 from ehelms/engine-setup

Engine: Updates to fix page loading after initial setup.
Merge pull request #3235 from ehelms/engine-content-search

Engine: Fixes #3325: Initial fixes to get content search UI working.
fixes #3477 - revert current_organization that was changed in #f6d6d93 until seeds.rb is ready