Bug 1025451: Include cartridge vendor in sdk cart ident function

Include the cartridge vendor when constructing a cartridge name/identifier from
the `primary_cartridge_name` function. This disambiguates cartridges provided by
other vendors (e.g. for builder cartridges such as Jenkins which will use the
identifier to construct new gears).
Fix bug 1028257
Fix bug 1025155: error message highlighting
Merge pull request #4132 from pmorie/bugs/1028257

Merged by openshift-bot
Merge pull request #4133 from ironcladlou/bz/1025451

Merged by openshift-bot
<node-proxy> Spec file updates to make brew happy
Fix cartridge extended tests: force erasure of installed cartridges during tests
Merge pull request #4135 from liggitt/bug_1025155_error_message_highlight

Merged by openshift-bot
Merge pull request #4134 from detiber/nodeProxySpec

Merged by openshift-bot
Merge pull request #4136 from pmorie/fix-tests

Merged by openshift-bot