File updates from 2.x banch dev snapshot.   Mainly CiviCRM related.