Criteria query that worked on EAP 5.1.2 now fails on EAP 5.2.0.

Possibly due to changes in this JIRA[1].

Generated query is:

select
this_.OFFER_CODE as OFFER1_23_6_,
this_.DESCRIPTION as DESCRIPT2_23_6_,
this_.PROD_SPEC_CODE as PROD6_23_6_,
this_.SALE_END_DTM as SALE3_23_6_,
this_.SALE_START_DTM as SALE4_23_6_,
this_.TERMS_AND_CONDITIONS as TERMS5_23_6_,
channels4_.OFFER_CODE as OFFER1_23_8_,
channel1_.CHANNEL_CODE as CHANNEL2_8_,
channel1_.CHANNEL_CODE as CHANNEL1_19_0_,
channel1_.DESCRIPTION as DESCRIPT2_19_0_,
prodspec2_.PROD_SPEC_CODE as PROD1_8_1_,
prodspec2_.DESCRIPTION as DESCRIPT2_8_1_,
prodspec2_.FARE_CATEGORY_CODE as FARE3_8_1_,
prodspec2_.PRODUCT_CATEGORY_CODE as PRODUCT4_8_1_,
prodspec2_.SKU as SKU8_1_,
productcat7_.PRODUCT_CATEGORY_CODE as PRODUCT1_24_2_,
productcat7_.DESCRIPTION as DESCRIPT2_24_2_,
productsku8_.SKU as SKU22_3_,
productsku8_.DESCRIPTION as DESCRIPT2_22_3_,
productspe9_.PROD_SPEC_CODE as PROD4_8_,
productspe9_.PROD_SPEC_CHARACTER_ID as PROD1_,
productspe9_.PROD_SPEC_CHARACTER_ID as PROD1_4_4_,
productspe9_.NAME as NAME4_4_,
productspe9_.PROD_SPEC_CODE as PROD4_4_4_,
productspe9_.VALUE as VALUE4_4_,
productoff10_.PROD_OFFER_PRICE_ID as PROD1_0_5_,
productoff10_.AMOUNT_IN_CENTS as AMOUNT2_0_5_,
productoff10_.INCLUDES_GST as INCLUDES3_0_5_,
productoff10_.OFFER_CODE as OFFER6_0_5_,
productoff10_.VALID_FROM_DATE as VALID4_0_5_,
productoff10_.VALID_TO_DATE as VALID5_0_5_
from
PRODUCT_OFFER this_
left outer join
PRODUCT_OFFER_CHANNEL channels4_
on this_.OFFER_CODE=channels4_.OFFER_CODE
left outer join
CHANNEL channel1_
on channels4_.CHANNEL_CODE=channel1_.CHANNEL_CODE
left outer join
PRODUCT_SPECIFICATION prodspec2_
on this_.PROD_SPEC_CODE=prodspec2_.PROD_SPEC_CODE
left outer join
PRODUCT_CATEGORY productcat7_
on prodspec2_.PRODUCT_CATEGORY_CODE=productcat7_.PRODUCT_CATEGORY_CODE
left outer join
PRODUCT_SKU productsku8_
on prodspec2_.SKU=productsku8_.SKU
left outer join
PROD_SPEC_CHARACTERISTIC productspe9_
on prodspec2_.PROD_SPEC_CODE=productspe9_.PROD_SPEC_CODE
left outer join
PROD_OFFER_PRICE productoff10_
on this_.OFFER_CODE=productoff10_.OFFER_CODE
where
channel1_.CHANNEL_CODE=?
and prodspec2_.PRODUCT_CATEGORY_CODE=?
and prodspec2_.FARE_CATEGORY_CODE=?
and this_.SALE_START_DTM<=?
and this_.SALE_END_DTM>=?
order by
this_.OFFER_CODE asc

Which fails with:

[org.hibernate.type.StringType] (http-192.168.121.93-8080-1) could not read column value
from result set: PROD4_8_8_; Invalid column name.

[1] https://issues.jboss.org/browse/JBPAPP-6395