[ Quote.hs ] Sorted imports
[ Quote.hs ] Renamed 'quote' to 'quoteTerm'
[ Quote.hs ] TypeChecking.Datatypes is not cyclically imported
Removed duplicated new type Str

The new type was defined in TypeChecking/Primitive.hs and
Utils/String.hs.
Merge branch 'maint-2.4.2'