Make symlinks to dialog-ok-apply consistent and add missing ones (LP: #1318162)
Merge remote-tracking branch 'upstream/master'