Merge branch 'master' into improve-tests

Conflicts:
	test/com/google/enterprise/adaptor/sharepoint/SharePointAdaptorTest.java