If there is a specific branch request, make sure the subquery also as it

Thanks @abadger, toshio :)
Fix the unit-tests for the new /api page
Fix the formatting of the template for the email address in the email notification system
Include the ACLs when accessing PackageListing.to_json and break loop in PackageListingAcl
Fix infinite loop when converting to json
Fix the /api/package/ endpoint by coming back to the former internal API method but fixing the to_json
If no acls are include then we want them all, otherwise we want none
Fix the conversion script to actually convert all the data

Thanks @abadger, Toshio :)