Also generally instead of using ocproducts_lib.php to find what files to/not-to include in the builds, use Composr's file API, and extend that to look in addon_files.txt too (much tidier - then absolutely everything can be classified as some kind of addon).

This issue should be done when major changes are made in the PHP architecture. Before then it's not worth messing around with the build filtering in case bugs are introduced in a timeframe where we're not reviewing the build process anyway.

Done - Took 4 days, not 4 hours. lol. Very carefully checked the build output to make sure it worked consistently.