Fixes 4654: Switches to using the Deface syntax for versions of Deface
less than 1.0.0 and locks down the versions avaiable for use.
Merge pull request #3813 from ehelms/fixes-4654

Fixes 4654: Switches to using the Deface syntax for versions of Deface
Merge remote-tracking branch 'upstream/master' into cv-merge-master-in
Merge pull request #3817 from daviddavis/cv-merge-master-in

Merging master into cv-rework