Do not attempt to filter if no conf is provided
Merge pull request #5569 from derekwaynecarr/only_filter_carts_if_configured

Merged by openshift-bot
fix undefined variable reference
Merge pull request #5576 from bparees/master

Merged by openshift-bot