jquery.json deprecation

* made adjustments in order to handle the jquery.json deprecation

Change-Id: I481855416710064e1ce1c659ffa1cfe9198285a5
Merge "jquery.json deprecation"