BZ 1069606 - hibernate is generating IDs a bit differently, fix bundle tests so they sort their query results in expected ways