breakup-984365: Update [add|remove]ItemsByModule to take options

This allows us to specify delayed loading properly.

Signed-off-by: Joe Walker <jwalker@mozilla.com>
Merge branch 'master' into mozmaster