Fixed type in http_server.js
Merge branch 'master' into integration

* master:
  Fixed type in http_server.js
Merge branch 'integration'

* integration: