Have cirrus use the safer query in beta

The plugin for it is only available in beta at this point.

Change-Id: I69ebf5833e0040f49f2e22ecb4403c3ee02af681