CAL-761 : update CF compliant with gatein 3.7.x