Picked some changes from a post-Crowd removal commit
More privatization of the client's generic stuff.
Finished up revisions to the authentication integration test
Fix up the remaining integration tests.