CPackWiX: fixed ambiguities and incorrect increment
Merge topic 'wix-fix-shortcut-ids' into next

a6ba28b CPackWiX: fixed ambiguities and incorrect increment