Bring fixes over from repofixes

.shortcuts files are now formatted
Fix for windows paths in results returned from management dialog
explorer (control 111)