[Qt] fix a issue where "command line options"-action overwrite "Preference"-action (on OSX)
[Qt] fix a issue where "command line options"-action overwrite "Preference"-action (on OSX)

- fixes #5800

Conflicts:
	src/qt/bitcoingui.cpp

Rebased-From: 9bbb880be44dbc378bdd3210eed42eaa77efb774
Github-Pull: #5858

RibbitFROG/ribbitcoin,projectinterzone/ITZ,jmgilbert2/energi,droark/elements,apoelstra/elements,ionomy/ion,pstratem/elements,mikehearn/bitcoinxt,my-first/octocoin,genavarov/ladacoin,capitalDIGI/DIGI-v-0-10-4,okinc/bitcoin,oklink-dev/bitcoin,DMDcoin/Diamond,truthcoin/blocksize-market,thelazier/dash,keesdewit82/LasVegasCoin,ionomy/ion,grumpydevelop/singularity,gwillen/elements,OmniLayer/omnicore,thelazier/dash,inkvisit/sarmacoins,Darknet-Crypto/Darknet,PandaPayProject/PandaPay,aburan28/elements,HeliumGas/helium,ingresscoin/ingresscoin,axelxod/braincoin,kleetus/bitcoinxt,xawksow/GroestlCoin,mycointest/owncoin,MazaCoin/mazacoin-new,oklink-dev/bitcoin,okinc/bitcoin,fussl/elements,tropa/axecoin,slingcoin/sling-market,coinkeeper/2015-06-22_18-52_viacoin,rdqw/sscoin,florincoin/florincoin,HeliumGas/helium,joulecoin/joulecoin,oklink-dev/bitcoin,LIMXTEC/DMDv3,fullcoins/fullcoin,Rav3nPL/doubloons-0.10,schinzelh/dash,axelxod/braincoin,pelorusjack/BlockDX,CoinProjects/AmsterdamCoin-v4,Electronic-Gulden-Foundation/egulden,rsdevgun16e/energi,MazaCoin/maza,keesdewit82/LasVegasCoin,DynamicCoinOrg/DMC,ionomy/ion,inkvisit/sarmacoins,DMDcoin/Diamond,MonetaryUnit/MUE-Src,pstratem/elements,tropa/axecoin,MazaCoin/maza,MonetaryUnit/MUE-Src,ediston/energi,ivansib/sibcoin,terracoin/terracoin,thelazier/dash,Electronic-Gulden-Foundation/egulden,LIMXTEC/DMDv3,DynamicCoinOrg/DMC,Kenwhite23/litecoin,dashpay/dash,KibiCoin/kibicoin,Darknet-Crypto/Darknet,mapineda/litecoin,putinclassic/putic,axelxod/braincoin,DMDcoin/Diamond,ArgonToken/ArgonToken,okinc/bitcoin,KibiCoin/kibicoin,ptschip/bitcoinxt,PIVX-Project/PIVX,PandaPayProject/PandaPay,xuyangcn/opalcoin,mapineda/litecoin,my-first/octocoin,dev1972/Satellitecoin,ticclassic/ic,genavarov/lamacoin,rsdevgun16e/energi,droark/elements,worldbit/worldbit,terracoin/terracoin,ticclassic/ic,dashpay/dash,midnight-miner/LasVegasCoin,OstlerDev/florincoin,pelorusjack/BlockDX,Vsync-project/Vsync,MazaCoin/maza,putinclassic/putic,genavarov/brcoin,xawksow/GroestlCoin,LIMXTEC/DMDv3,terracoin/terracoin,nmarley/dash,ticclassic/ic,crowning-/dash,crowning-/dash,octocoin-project/octocoin,ahmedbodi/test2,jmgilbert2/energi,OstlerDev/florincoin,aburan28/elements,RibbitFROG/ribbitcoin,thelazier/dash,xawksow/GroestlCoin,capitalDIGI/DIGI-v-0-10-4,alejandromgk/Lunar,pinkevich/dash,zottejos/merelcoin,ptschip/bitcoinxt,Mrs-X/Darknet,fussl/elements,mockcoin/mockcoin,joulecoin/joulecoin,HeliumGas/helium,ArgonToken/ArgonToken,kleetus/bitcoinxt,tropa/axecoin,Kenwhite23/litecoin,xuyangcn/opalcoin,npccoin/npccoin,RyanLucchese/energi,pelorusjack/BlockDX,ahmedbodi/test2,thelazier/dash,ivansib/sib16,koharjidan/litecoin,lakepay/lake,puticcoin/putic,octocoin-project/octocoin,Mrs-X/PIVX,keesdewit82/LasVegasCoin,tropa/axecoin,mycointest/owncoin,mapineda/litecoin,freelion93/mtucicoin,cerebrus29301/crowncoin,genavarov/ladacoin,jtimon/elements,MonetaryUnit/MUE-Src,tropa/axecoin,biblepay/biblepay,worldbit/worldbit,putinclassic/putic,PIVX-Project/PIVX,Kenwhite23/litecoin,DynamicCoinOrg/DMC,freelion93/mtucicoin,Mrs-X/Darknet,ColossusCoinXT/ColossusCoinXT,fussl/elements,capitalDIGI/litecoin,ivansib/sibcoin,willwray/dash,DMDcoin/Diamond,UdjinM6/dash,ivansib/sib16,pelorusjack/BlockDX,apoelstra/elements,my-first/octocoin,antcheck/antcoin,putinclassic/putic,koharjidan/litecoin,schinzelh/dash,mycointest/owncoin,projectinterzone/ITZ,lakepay/lake,droark/elements,dev1972/Satellitecoin,pascalguru/florincoin,NunoEdgarGub1/elements,Thracky/monkeycoin,alejandromgk/Lunar,cerebrus29301/crowncoin,NunoEdgarGub1/elements,PIVX-Project/PIVX,pelorusjack/BlockDX,PIVX-Project/PIVX,projectinterzone/ITZ,BlockchainTechLLC/3dcoin,droark/elements,Thracky/monkeycoin,jtimon/elements,lakepay/lake,ediston/energi,pascalguru/florincoin,Rav3nPL/doubloons-0.10,ColossusCoinXT/ColossusCoinXT,DMDcoin/Diamond,npccoin/npccoin,puticcoin/putic,KibiCoin/kibicoin,xuyangcn/opalcoin,Thracky/monkeycoin,upgradeadvice/MUE-Src,KibiCoin/kibicoin,benzmuircroft/REWIRE.io,capitalDIGI/DIGI-v-0-10-4,diggcoin/diggcoin,CoinProjects/AmsterdamCoin-v4,capitalDIGI/litecoin,florincoin/florincoin,48thct2jtnf/P,48thct2jtnf/P,slingcoin/sling-market,npccoin/npccoin,genavarov/lamacoin,mockcoin/mockcoin,PIVX-Project/PIVX,pinkevich/dash,NunoEdgarGub1/elements,okinc/bitcoin,NunoEdgarGub1/elements,octocoin-project/octocoin,crowning-/dash,HeliumGas/helium,LIMXTEC/DMDv3,DMDcoin/Diamond,Bloom-Project/Bloom,lakepay/lake,xawksow/GroestlCoin,koharjidan/litecoin,presstab/PIVX,aburan28/elements,terracoin/terracoin,dashpay/dash,freelion93/mtucicoin,apoelstra/elements,florincoin/florincoin,ArgonToken/ArgonToken,Mrs-X/PIVX,dev1972/Satellitecoin,RibbitFROG/ribbitcoin,zottejos/merelcoin,puticcoin/putic,aburan28/elements,genavarov/brcoin,DynamicCoinOrg/DMC,GwangJin/gwangmoney-core,droark/elements,genavarov/lamacoin,ingresscoin/ingresscoin,projectinterzone/ITZ,okinc/bitcoin,genavarov/lamacoin,ptschip/bitcoinxt,fussl/elements,aspirecoin/aspire,Petr-Economissa/gvidon,OmniLayer/omnicore,xuyangcn/opalcoin,Vsync-project/Vsync,schinzelh/dash,ColossusCoinXT/ColossusCoinXT,nmarley/dash,MazaCoin/mazacoin-new,genavarov/ladacoin,worldbit/worldbit,benzmuircroft/REWIRE.io,Darknet-Crypto/Darknet,aburan28/elements,Rav3nPL/doubloons-0.10,jmgilbert2/energi,biblepay/biblepay,BlockchainTechLLC/3dcoin,npccoin/npccoin,UdjinM6/dash,ahmedbodi/test2,mockcoin/mockcoin,benzmuircroft/REWIRE.io,Mrs-X/PIVX,cerebrus29301/crowncoin,terracoin/terracoin,alejandromgk/Lunar,diggcoin/diggcoin,ticclassic/ic,dmrtsvetkov/flowercoin,PandaPayProject/PandaPay,benzmuircroft/REWIRE.io,LIMXTEC/DMDv3,ColossusCoinXT/ColossusCoinXT,fussl/elements,OmniLayer/omnicore,PandaPayProject/PandaPay,axelxod/braincoin,CoinProjects/AmsterdamCoin-v4,sipa/elements,Rav3nPL/doubloons-0.10,antcheck/antcoin,capitalDIGI/litecoin,dashpay/dash,ionomy/ion,RyanLucchese/energi,dev1972/Satellitecoin,MazaCoin/maza,MazaCoin/maza,48thct2jtnf/P,antcheck/antcoin,rdqw/sscoin,pinkevich/dash,BlockchainTechLLC/3dcoin,ivansib/sibcoin,pinkevich/dash,keesdewit82/LasVegasCoin,grumpydevelop/singularity,nmarley/dash,ColossusCoinXT/ColossusCoinXT,apoelstra/elements,truthcoin/blocksize-market,pstratem/elements,fullcoins/fullcoin,pstratem/elements,Mrs-X/Darknet,MonetaryUnit/MUE-Src,crowning-/dash,midnight-miner/LasVegasCoin,Rav3nPL/doubloons-0.10,keesdewit82/LasVegasCoin,dmrtsvetkov/flowercoin,my-first/octocoin,nmarley/dash,grumpydevelop/singularity,dashpay/dash,ivansib/sib16,truthcoin/blocksize-market,willwray/dash,freelion93/mtucicoin,inkvisit/sarmacoins,okinc/bitcoin,my-first/octocoin,diggcoin/diggcoin,gwillen/elements,dmrtsvetkov/flowercoin,genavarov/lamacoin,aspirecoin/aspire,oklink-dev/bitcoin,ediston/energi,Mrs-X/Darknet,Petr-Economissa/gvidon,UdjinM6/dash,capitalDIGI/DIGI-v-0-10-4,Bloom-Project/Bloom,mockcoin/mockcoin,NunoEdgarGub1/elements,HeliumGas/helium,capitalDIGI/DIGI-v-0-10-4,ticclassic/ic,truthcoin/blocksize-market,rdqw/sscoin,UdjinM6/dash,mockcoin/mockcoin,puticcoin/putic,gwillen/elements,Thracky/monkeycoin,RyanLucchese/energi,npccoin/npccoin,zottejos/merelcoin,fussl/elements,jtimon/elements,mikehearn/bitcoinxt,mockcoin/mockcoin,mycointest/owncoin,Mrs-X/Darknet,worldbit/worldbit,OmniLayer/omnicore,Bloom-Project/Bloom,octocoin-project/octocoin,Rav3nPL/doubloons-0.10,pinkevich/dash,biblepay/biblepay,mapineda/litecoin,MazaCoin/maza,freelion93/mtucicoin,ingresscoin/ingresscoin,florincoin/florincoin,Darknet-Crypto/Darknet,Mrs-X/PIVX,crowning-/dash,ahmedbodi/test2,ArgonToken/ArgonToken,Vsync-project/Vsync,RibbitFROG/ribbitcoin,Darknet-Crypto/Darknet,capitalDIGI/litecoin,apoelstra/elements,xawksow/GroestlCoin,OmniLayer/omnicore,genavarov/lamacoin,Mrs-X/PIVX,dmrtsvetkov/flowercoin,Kenwhite23/litecoin,biblepay/biblepay,koharjidan/litecoin,fullcoins/fullcoin,LIMXTEC/DMDv3,Petr-Economissa/gvidon,slingcoin/sling-market,OstlerDev/florincoin,dmrtsvetkov/flowercoin,ptschip/bitcoinxt,lakepay/lake,pelorusjack/BlockDX,kleetus/bitcoinxt,MazaCoin/mazacoin-new,inkvisit/sarmacoins,PIVX-Project/PIVX,KibiCoin/kibicoin,zottejos/merelcoin,fullcoins/fullcoin,slingcoin/sling-market,schinzelh/dash,freelion93/mtucicoin,MazaCoin/mazacoin-new,coinkeeper/2015-06-22_18-52_viacoin,presstab/PIVX,willwray/dash,inkvisit/sarmacoins,rsdevgun16e/energi,xuyangcn/opalcoin,jmgilbert2/energi,MonetaryUnit/MUE-Src,ivansib/sibcoin,capitalDIGI/litecoin,Petr-Economissa/gvidon,OstlerDev/florincoin,ingresscoin/ingresscoin,aspirecoin/aspire,pinkevich/dash,benzmuircroft/REWIRE.io,worldbit/worldbit,slingcoin/sling-market,ionomy/ion,gwillen/elements,upgradeadvice/MUE-Src,apoelstra/elements,grumpydevelop/singularity,PIVX-Project/PIVX,coinkeeper/2015-06-22_18-52_viacoin,PIVX-Project/PIVX,mikehearn/bitcoinxt,ahmedbodi/test2,ptschip/bitcoinxt,Kenwhite23/litecoin,terracoin/terracoin,BlockchainTechLLC/3dcoin,kleetus/bitcoinxt,ivansib/sib16,joulecoin/joulecoin,putinclassic/putic,tropa/axecoin,GwangJin/gwangmoney-core,jmgilbert2/energi,GwangJin/gwangmoney-core,biblepay/biblepay,jtimon/elements,xawksow/GroestlCoin,coinkeeper/2015-06-22_18-52_viacoin,48thct2jtnf/P,upgradeadvice/MUE-Src,CoinProjects/AmsterdamCoin-v4,sipa/elements,rdqw/sscoin,ediston/energi,kleetus/bitcoinxt,Thracky/monkeycoin,genavarov/ladacoin,Electronic-Gulden-Foundation/egulden,oklink-dev/bitcoin,rsdevgun16e/energi,DynamicCoinOrg/DMC,octocoin-project/octocoin,pascalguru/florincoin,OstlerDev/florincoin,midnight-miner/LasVegasCoin,ediston/energi,oklink-dev/bitcoin,cerebrus29301/crowncoin,nmarley/dash,antcheck/antcoin,Petr-Economissa/gvidon,biblepay/biblepay,kleetus/bitcoinxt,keesdewit82/LasVegasCoin,antcheck/antcoin,presstab/PIVX,Kenwhite23/litecoin,Electronic-Gulden-Foundation/egulden,slingcoin/sling-market,gwillen/elements,florincoin/florincoin,jtimon/elements,diggcoin/diggcoin,sipa/elements,ingresscoin/ingresscoin,OmniLayer/omnicore,RibbitFROG/ribbitcoin,mikehearn/bitcoinxt,schinzelh/dash,ArgonToken/ArgonToken,crowning-/dash,genavarov/brcoin,BlockchainTechLLC/3dcoin,upgradeadvice/MUE-Src,inkvisit/sarmacoins,presstab/PIVX,Vsync-project/Vsync,willwray/dash,mikehearn/bitcoinxt,axelxod/braincoin,projectinterzone/ITZ,benzmuircroft/REWIRE.io,worldbit/worldbit,zottejos/merelcoin,Mrs-X/PIVX,DynamicCoinOrg/DMC,joulecoin/joulecoin,genavarov/brcoin,pstratem/elements,mycointest/owncoin,truthcoin/blocksize-market,MazaCoin/mazacoin-new,rdqw/sscoin,RyanLucchese/energi,mycointest/owncoin,koharjidan/litecoin,NunoEdgarGub1/elements,genavarov/brcoin,aspirecoin/aspire,pascalguru/florincoin,ahmedbodi/test2,Darknet-Crypto/Darknet,UdjinM6/dash,mapineda/litecoin,Vsync-project/Vsync,koharjidan/litecoin,Petr-Economissa/gvidon,ivansib/sib16,ArgonToken/ArgonToken,willwray/dash,midnight-miner/LasVegasCoin,ediston/energi,mapineda/litecoin,schinzelh/dash,PIVX-Project/PIVX,Electronic-Gulden-Foundation/egulden,axelxod/braincoin,Bloom-Project/Bloom,jtimon/elements,sipa/elements,ionomy/ion,midnight-miner/LasVegasCoin,lakepay/lake,ColossusCoinXT/ColossusCoinXT,joulecoin/joulecoin,ptschip/bitcoinxt,RyanLucchese/energi,zottejos/merelcoin,fullcoins/fullcoin,Bloom-Project/Bloom,alejandromgk/Lunar,sipa/elements,pascalguru/florincoin,BlockchainTechLLC/3dcoin,jmgilbert2/energi,dev1972/Satellitecoin,Bloom-Project/Bloom,dmrtsvetkov/flowercoin,joulecoin/joulecoin,Thracky/monkeycoin,willwray/dash,puticcoin/putic,MazaCoin/mazacoin-new,rdqw/sscoin,genavarov/ladacoin,PandaPayProject/PandaPay,PandaPayProject/PandaPay,ingresscoin/ingresscoin,Mrs-X/Darknet,RibbitFROG/ribbitcoin,gwillen/elements,octocoin-project/octocoin,presstab/PIVX,midnight-miner/LasVegasCoin,alejandromgk/Lunar,upgradeadvice/MUE-Src,alejandromgk/Lunar,truthcoin/blocksize-market,coinkeeper/2015-06-22_18-52_viacoin,genavarov/ladacoin,presstab/PIVX,grumpydevelop/singularity,nmarley/dash,florincoin/florincoin,48thct2jtnf/P,Vsync-project/Vsync,MonetaryUnit/MUE-Src,rsdevgun16e/energi,CoinProjects/AmsterdamCoin-v4,droark/elements,Electronic-Gulden-Foundation/egulden,nmarley/dash,diggcoin/diggcoin,cerebrus29301/crowncoin,GwangJin/gwangmoney-core,xuyangcn/opalcoin,ivansib/sib16,aspirecoin/aspire,biblepay/biblepay,puticcoin/putic,OstlerDev/florincoin,dev1972/Satellitecoin,ticclassic/ic,cerebrus29301/crowncoin,aburan28/elements,grumpydevelop/singularity,biblepay/biblepay,KibiCoin/kibicoin,diggcoin/diggcoin,aspirecoin/aspire,capitalDIGI/DIGI-v-0-10-4,antcheck/antcoin,pascalguru/florincoin,upgradeadvice/MUE-Src,pstratem/elements,48thct2jtnf/P,rsdevgun16e/energi,CoinProjects/AmsterdamCoin-v4,my-first/octocoin,genavarov/brcoin,coinkeeper/2015-06-22_18-52_viacoin,RyanLucchese/energi,npccoin/npccoin,putinclassic/putic,ivansib/sibcoin,fullcoins/fullcoin,ivansib/sibcoin,mikehearn/bitcoinxt,sipa/elements,capitalDIGI/litecoin,HeliumGas/helium