Merge proposals dependent on lp://staging/~jeremywootten/pantheon-files/fix-1042439-open-link-type-desktop-files-correctly

1. fix-1042439-open-link-type-desktop-files-correctly
2. Dependent merge proposals