Fix for error when Elemental's JSON boxes null/undefined values. Elemental wraps java values into js Object for Dev Mode to work. I simplified code and added checks for null/undefined values that should not be wrapped. Bug: issue 8306 Change-Id: I085466780c2fd9182197c4a050a044e1d6468775