ignore test related to JSONObject
Merge remote-tracking branch 'origin/dev'

Conflicts:
	modules/de-common-module/src/test/java/org/iplantc/de/client/util/DiskResourceUtilTest.java