Merged changes from svn/trunk to add the REMOVE_CXX_FLAGS macro