juwang - sync changes from master branch for http server

reef-webserver should have the same code between master and reef-bridge branches as this module has no special things for reef-bridge. This PL is to bring them in sync.