Merge "Setup branch in setup-devstack-source-dirs"