[3.0] Set extra version number when building MSI

• Use the @VERSION_EXTRA@ which is used in the exe build in place of the static '0'
• Change the Display Name in appwiz.cpl to be just the product name, matching the exe build

Backport of !1801 (merged)