C++17: Removed homegrown Variant code and replaced it with std::variant

First set of changes using C++17.

Merge request reports

Loading