Fix #1381 by using a more public way of handling OData URL rewriting.

Bye bye private reflection, hello string-based property bag injection :).

Fixes #1381