Merge #10545: Use list initialization (C++11) for maps/vectors instead of boost:...