Making the add-on manager more .. not a singleton
Merge branch 'refs/heads/2.3/develop' into 3.0/develop