Use separate components for shortcuts

Use separate components for shortcuts

Since the Start Menu and Desktop are different folders, we should
use different components for the shortcuts in those folders, given
that components operate at directory granularity.

Take the opportunity to use the newer style for installing shortcuts
and registry keys, and make the names more descriptive.

Increment the buildlevel to ensure new files are installed.

(cherry picked from commit fe9a1d24c5ce9dd415658493c1811aa9e54aebce)

ticket: 7348
status: resolved