Backported rev. 836279 to fix pagination and unconstrained searches of shipments; this also fixes OFBIZ-3002