Remove some clang warnings that prevented linking.
Quell clang C++0x warnings.
Merge Bug838915 onto upstream ESR17.
Merge Bug831552 onto upstream ESR17.