Merge branch '2917_cppflags_cleanup' into 4.8.1-stable