Update OpenStackManager to 1.25wmf2 HEAD

Change-Id: Ie93de7bd79370c0d578b0cd8825e785cf6d09dd3