Bug 980928
Fix bug 983583: remove gear validation step for compatible upgrades
Bug BZ983545 - force_clean_build fails on NodeJS

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

We were removing the global modules on force_clean_build.
Since they are all symlinks, we only remove actual directories.
Fix for bug 980760
 - fixing error message on validation failure
 - removing downloaded cart manifest entry from app if adding a url based cart fails
Fix syntax error in oo-app-state-show
Merge pull request #3066 from pmorie/dev/upgrades

Merged by openshift-bot
Merge pull request #3065 from fotioslindiakos/BZ983545

Merged by openshift-bot
Merge pull request #3068 from abhgupta/bug_980760

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

Merged by openshift-bot
Bug 983780 - parse log files separately and compare timestamps on merge
Merge pull request #3071 from ironcladlou/oo-state-show-fix

Merged by openshift-bot
Merge pull request #3073 from rmillner/awakenings

Merged by openshift-bot