Tweak composer (just testing something).
Reverting change.
Validation factory tweaks
Validator constructor fixes
Merge pull request #4115 from GrahamCampbell/4.1-validator

[4.1] Validation Tweaks/Fixes