Merged-in the code for the new app variants.
The version of HttpTest in this version supports server-based upload speed testing, falling back to locally measured values if server-based testing not available.