Merge pull request #268 from tbak/2.x

2.x multiple updates
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
Patch static content handler to resolve properly resource URI and read from jar file.
Merge remote-tracking branch 'remotes/netflix/2.x' into 2.x