Merge "Support OpenStack Cloud Jenkins plugin upgrade"