Couple more Service module test fixes, status now Tests run: 98, Failures: 7, Errors: 15, Skipped: 3.
Fix four more UG Services module tests.
Fix breakage in query visitor for non-string values.
Fix more UG Service module tests, status now Tests run: 98, Failures: 5, Errors: 10, Skipped: 3.
Merge remote-tracking branch 'upstream/two-dot-o' into two-dot-o