Change uses of boost::optional due to breaking changes in boost 1.56.0