Server boostrap config refactor + moved some files around to the proper package
More config refactoring
Adding a "dummy" replication port to the bridge server config
Merge pull request #269 from qiangdavidliu/2.x

Bootstrap config refactor