devstack changes to have it work with github changes