Update queries in preparation for OpenDJ 2.6.1