Card origin_node_401 - Fix extended tests

* Refactor gear functional tests
* Refactor upgrade functional tests
Merge pull request #5649 from jwhonce/origin_node_401

Merged by openshift-bot