o.c.nams.filterhandler: Fixed product configuration.
Merge branch 'rel15x' into develop