Merge "Add opecontrail.upgade.verify state"