update the symfony packages in composer to bring .lock inline with .json and solve a problem with mismatched dependencies
Merge branch 'update-composer'