Migrate endpoints during upgrade.

broker code for endpoint upgrade of gears

Fix unit tests.
Keep proxy gears disabled appropriately

Modify enable-server to keep all proxy gears disabled if the ratio of
web to proxy gears is > 2 (previously this only applied to the
local-gear)
Bug 1003531: An warning message should be thrown out instead of error message when restore a app with postgresql-8.4 (and postgresl-9.2) cartridge
card_169
Merge pull request #4202 from bparees/psql_restore_invalid_error

Merged by openshift-bot
Merge pull request #4198 from ncdc/haproxy-keep-proxy-gears-disabled

Merged by openshift-bot
bug 997924: jbossas-7 build fails if the app has mock-plugin addon
Merge pull request #4209 from mrunalp/dev/upgrade_endpoints

Merged by openshift-bot
Merge pull request #4204 from lnader/master

Merged by openshift-bot
Merge pull request #4210 from bparees/mock_error

Merged by openshift-bot
Up tries on http assertions in functional API
Merge pull request #4212 from pmorie/dev/fix-tests

Merged by openshift-bot
Fix viminfo file error when using vim within gears
Merge pull request #4215 from jhadvig/vim

Merged by openshift-bot