[MERGE][Bug #5454] When two plugin commands conflict, both sources are now shown

[Ian Clatworthy]

Ian Clatworthy has voted comment.
Status is now: Waiting
Comment:
Could you provide a test as well please?

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C1188058243.6064.23.camel%40lapbert%3E