Bug 1106415 - Allow the add-on SDK to dynamically insert add-on options. r=mfinkle

--HG--
extra : rebase_source : fb958f6d6f77cd6bc2d356b6b76107fc653dff12
extra : amend_source : 67b932a1a42836cc824478ffe11f4b8f4da592a7
Bug 681432 - Support all add-on types in the add-on manager. r=mfinkle

--HG--
extra : rebase_source : e5ca39397adf3364924c8b1b6ca9f53862cc7136