Bug 920032 - Port to Express
Fix bug 919464 - Add habitat support for loading config from file