Fix comparison in dup resources acceptance test

Due to changes in Puppet 3.6.0, the comparison done in our resource duplication
tests no longer matches the actual output. This patch ammends the comparison to
match Puppet 3.6.0 output now.

Signed-off-by: Ken Barber <ken@bob.sh>
Merge pull request #968 from kbarber/ticket/1.6.x/fix-puppet-collection-collision-test

Fix comparison in dup resources acceptance test
Merge branch '1.6.x' into stable

* 1.6.x:
  Fix comparison in dup resources acceptance test
Merge branch 'stable'

* stable:
  Fix comparison in dup resources acceptance test
(PDB-467) Collapse versioned files for http tests

This patch removes all remaining versioned http test files into shared
unversioned files, so that we may start iterating across versions in the
same file.

Signed-off-by: Ken Barber <ken@bob.sh>
(PDB-467) Create deftestseq and implement it everywhere

This patch creates deftestseq which really is just a combination of deftest
and Ryan's doseqver. This has been implemented across all http tests now
as a standard for iterating across each available API version for that
particular end-point.

All cases of :use have been moved into their relevant :require sections for
all these tests as well, including some other various cleanups.

Signed-off-by: Ken Barber <ken@bob.sh>