Merge "Bug 6745 Remove thread renaming and unnecessary logging" into stable/boron