Conjunctive-Query Containment and Constraint Satisfaction Conjunctive Query Containment and Constraint