[master] Don't use c++11 feature in master branch.
Merge pull request #3765 from dumganhar/ccb-control-master

[master] Don't use c++11 feature in master branch.