PULL_2005 added tests for adding supplementary groups when creating new gears in a node
PULL_2005 fixed code review bugs for adding supplementary groups to new gears
PULL_2005 Changed GEAR_SUPL_GRPS to GEAR_SUPPLEMENTARY_GROUPS in node and tests
Bug 977563

Instead of using glob, explicitly list templates belonging to the Ruby
cartridge.
Merge pull request #2939 from BanzaiMan/dev/hasari/bz977563

Bug 977563
Merge pull request #2954 from pmorie/dev/os_migrations

Merged by openshift-bot
Bug 977950 - Copying the v1 descriptions back into the v2 versions of the cartridge.
Bug 979134 - the v1 cart version check was matching older versions of the v2 cart and is no longer necessary.
Merge pull request #2827 from genesarm/PULL_2005

Merged by openshift-bot
Bug 978261 - find the external ethernet device rather than hard-code eth0
Bug 977493 - Avoid leaking the lock file descriptor to child processes.
remove v2 folder from cart install
Merge pull request #2955 from rmillner/misc_bugs

Merged by openshift-bot
Merge pull request #2957 from rmillner/BZ977493

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

Merged by openshift-bot
Remove unused scripts.
Merge pull request #2961 from mrunalp/dev/idler_cleanup

Merged by openshift-bot
Rename oo-admin-migrate to oo-admin-upgrade
WIP: rename migrate to upgrade in oo-admin-upgrade
WIP: rename migrate to upgrade in code