fixed test failures on jdk8. json field order mismatch
Merge pull request #752 from Unicon/jdk8-test-fixes

Fix test failures on JDK8