[PRD-3281] Revert prior changes and replace URLEncoder
Merge pull request #33 from pentaho-tband/dev

[PRD-3281] Revert prior changes and replace URLEncoder