Merge changes I5125755b,I312e55a5 into sc-dev

* changes:
  Updating tests to honor per-app TRACK_DEFAULT
  Changing per-app default request to TRACK_DEFAULT