Re-merge fixes for bug 476, bug 1895, bug 2049, bug 2149, bug 2509, bug 2539 and bug 2531.
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.