teiiddes-2137: Changes to allow generated REST war to compile and run using the new runtime client in 8.5.x.
Merge pull request #358 from tejones/teiiddes-2137

teiiddes-2137