acu161341 change to use local definition of deep_sorted_json due to issue with right_support and ruby 1.9+
Merge branch 'sapphire_14_07_acu161341_testing_server_and_client'