fix devstack with correct git branching