Replace boost::optional with std::optional

Link Mauverequested to merge
std-optional into master

And boost::none with std::nullopt.

The #includes were a bit wrong too, this commit fixes them.

Merge request reports