Making some temporary changes to work around all C# code going into one namespace, https://github.com/NREL/OpenStudio/issues/679

[#43144741]
Clean up hpp files for better SWIG'ing

[#43144741]