LIVEOAK-706: Fix encoding issues between JSON and ResourceStates, more consistent behaviour between converting back and forth.
Merge pull request #417 from mwringe/LIVEOAK-706

LIVEOAK-706: Fix encoding issues between JSON and ResourceStates, more c...