[addons] allow RunAddon() to run plugin and script add-ons that have a service add-on in the metadata first. fixes
[cosmetics] indenting
Merge pull request #4371 from jmarshallnz/runaddon_fix

Runaddon fix - allows secondary extension points to be run