Refs #7970 - Fix non-Windows error.

Visual Studio failed to pick up the extra qualification in the header
file.
Merge branch 'feature/7970_alternative_cuboid_xml_definition' into develop