[cvs-nhc98] patch applied (hat): remove -package lang, add -package containers