Merge "Fix standalone ControllerOpenstack vars" into stable/pike