Merge "Update to use devstack tip of branch"