WP-2231: Remove extraneous dpm.
WP-2231: Add an option to the UI to restrict number of comma separated items.
WP-2231: Prevent undefined index errors.
WP-2272 Check if items has no files
WP-2231: Limit terms by depth.
Merge branch 'release-2.1'