[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
[PDI-12482] - Reverting Encr arg check as 2 and only 2 arguments are always used
Merge pull request #624 from brosander/PDI-12482

[PDI-12482] - Reverting Encr arg check as 2 and only 2 arguments are alw...