WELD-1339 Update BeanAttributes handling to match the spec