Re-merge fixes for bugs 476, 1895, 2049, 2149, 2509 and 2539.
Made by JonC 14/05/01Introduction of emulator_launcher component for the 6.1 SDKs i.e. these are the stub launchersthat were present on the 6.0 SDKs, together with a new launcher for pepoc.