Issue #2914776 by thejimbirch: Remove Contact bundles from base, and add it and Webform as optional Sub-modules
