Have the dependencies resolving correctly for Azure 2.1. Tests don't pass, but I can't get to ASB from this machine, so I'll get those fixed in the next commit.