Update code for default server.js so no warning are displayed

When running with a newest express module, this
message is shown :

  Warning: express.createServer() is deprecated, express
  applications no longer inherit from http.Server,
  please use:

    var express = require("express");
    var app = express();
fixing rebase

fix rebasing conflicts

change server to broker

change server to broker
Adding jenkins templates to carts
Card 515 - Improve test coverage
Corrected test to reflect changes in API
adding jenkins artifacts glob
Merge pull request #1521 from mscherer/fix/nodejs/remove_warning_on_express

Merged by openshift-bot
V2 cart state management implementation
Typo fixes
Merge pull request #1856 from danmcp/master

Adding jenkins jobs to v2 carts
Merge pull request #1859 from ironcladlou/dev/v2carts/state-management

Merged by openshift-bot
Bug 928752: Run threaddump/system-messages only on primary cart

Fix a regression whereby threaddump and system-messages actions were being
sent to non-primary cartridges.

Resolve https://bugzilla.redhat.com/show_bug.cgi?id=928752.
Merge pull request #1861 from brenton/typo1

Typo fixes
Merge pull request #1669 from tdawson/tdawson/minor-spec-cleanup/2013-03-15

Merged by openshift-bot
adding all the jenkins jobs
Merge pull request #1862 from ironcladlou/bz/928752

Merged by openshift-bot
Merge pull request #1864 from danmcp/master

Updating jenkins templates
Revert "Update code for default server.js so no warning are displayed"

This reverts commit d6763549b49a11937f7b6bbff84f1583fa786414.