Merge with master II.
Utilize Bug 878472 - Let local debugger clients find the DebuggerServerConnection