Inject not yet installed macros in the WYSIWYG macro picker

[tmortagne]

@surli

So what the UI would be showing if a decision needs to be taken by the user (e.g. in case of conflicts)? Just an error specifying that the macro cannot be installed?

Non-interactive mode just apply the proposed resolution (what you get when you just click Continue).