Adding latest refactoring of states for managing openshift origin.