Shortcut settings: Update collision markers when resetting shortcut

Task-number: QTCREATORBUG-6400

Change-Id: Ibef1da2fb71d157769412d7cbbd730e7656979ed
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Do '&', '&&' conversion when creating id for external tool

Task-number: QTCREATORBUG-5827

Change-Id: Ib2a30a5c051be652ea99ff1923456d352b23a71d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>