Refs #10487. Changed back to std::multimap and now using std::tie
Refs #10487. reverted all changes to ParameterMap
Refs #10487. cleanup white space
Merge branch 'feature/10487_fix_performance_of_GeometryTest' into develop