Bug 982482
Fix upgrade functionality and associated tests
Fix for bug 982549
 - Simplified regex to work with ruby 2.0 in Fedora 19
Fix bug 981273
Merge pull request #3015 from mrunalp/bugs/982482

Merged by openshift-bot
Merge pull request #3016 from pmorie/dev/fix_tests

Merged by openshift-bot
Merge pull request #3018 from abhgupta/bug_982549

Merged by openshift-bot
Merge pull request #3019 from pmorie/bugs/981273

Merged by openshift-bot