MULE-7883: Reverting schema rewrite line that was causing trouble. Adding test to cover scenario.
Merge pull request #1023 from mulesoft/MULE-7883-2

MULE-7883: Reverting schema rewrite line that was causing trouble. Addin...