Adjust cvc4 packaging as per mentor's suggestion.  (Thanks Michael Tautschnig.)
Merge branch 'master' into devel