allow ACL query parameters to be overriden
Merge branch 'master' of https://github.com/googlegsa/database

Conflicts:
	src/com/google/enterprise/adaptor/database/DatabaseAdaptor.java