Removing cruft leftover from the deprecation of include+with_items

Also cleaning up integration tests that had checks for the empty item
attribute in certain results.

Fixes #7535