[PDI-12466] - Fixing duplicate file from previous pull
Merge pull request #619 from brosander/PDI-12466-test-backport

[PDI-12466] - Fixing duplicate file from previous pull
[PDI-12472] - JSON Output Functionality Changes Significantly in 5.1 from 5.0

Rolling back to a known good state
Merge pull request #623 from rfellows/5.1-dev

[PDI-12472] - JSON Output Functionality Changes Significantly in 5.1 from 5.0