Fixed the convertEntityPartialSetToJson so that we no longer try to Json encode an HashMap object.