Plan B on AddonPrefab concept

Various fixes to addon loading/cleanup.

Signed-off-by: Chris Sanders <zidane@outlook.com>