Integrate against 2.1

This adds 2.1-rc4 to the list of servers to test against.