card_169
bug 997924: jbossas-7 build fails if the app has mock-plugin addon
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
Bug 1032950

Change ownership of by-id link to gear uid/gid so future deployments
that don't go through mcollective don't fail because of file
permissions issues.
Merge pull request #4215 from jhadvig/vim

Merged by openshift-bot
Merge pull request #4214 from ncdc/bz1032950-lchown-by-id-link

Merged by openshift-bot