channelstream: move into apps

rhodecode/apps/channelstream/__init__.py

@@ -85,4 +85,6 b' def includeme(config):'
     config.add_route(
         name='channelstream_proxy',
         pattern=settings.get('channelstream.proxy_path') or '/_channelstream')
-    config.scan('rhodecode.channelstream')
+
+    # Scan module for configuration decorators.
+    config.scan()

rhodecode/config/middleware.py

@@ -278,12 +278,12 b' def includeme(config):'
     config.include('pyramid_mako')
     config.include('pyramid_beaker')
 
-    config.include('rhodecode.channelstream')
     config.include('rhodecode.authentication')
     config.include('rhodecode.integrations')
 
     # apps
     config.include('rhodecode.apps.admin')
+    config.include('rhodecode.apps.channelstream')
     config.include('rhodecode.apps.login')
     config.include('rhodecode.apps.user_profile')