Merge "C++11 related clean-up of DISALLOW_.."