Bug 959844 - JBoss EWS v2 Cartridge fixes for EWS1.0

https://bugzilla.redhat.com/show_bug.cgi?id=959844

The JBoss EWS v2 cartridge previously advertised EWS1.0 support without
requiring tomcat6 be installed, so if the v2 cart was installed without
also installing the v1 EWS1.0 cart, EWS1.0 support would be advertised,
but created apps would fail.
Add collapse_dates helper method
Check cartridge name for reserved names ('app-root', 'git')
Bug 960378 960458
Do not try to unlock gear after destroy
Merge pull request #2353 from detiber/bz959844

Merged by openshift-bot
Merge pull request #2369 from liggitt/date_helper

Merged by openshift-bot
Merge pull request #2370 from fotioslindiakos/BZ958619

Bug 958619: Do not try to unlock gear after destroy
Merge pull request #2371 from bdecoste/master

Bug 960378 960458 [merge]
Merge pull request #2364 from BanzaiMan/dev/hasari/reserved_cartridge_names

Check cartridge name for reserved names ('app-root', 'git')