2671952 compiling on solaris isn't clean for HEAD
9 files changed