refactor for ose-2.1
Merge branch 'ose-2.1' of github.com:OpenShift-QE-Team/ShiftBox into ose-2.1