-n  Merge in changes from XAL including replacing HashMap return types with more generic Map.
-n 
Merge in changes from XAL including replacing HashMap return types with more generic Map.

luxiaohan/openxal-csns-luxh,luxiaohan/openxal-csns-luxh,openxal/openxal,luxiaohan/openxal-csns-luxh,openxal/openxal,EuropeanSpallationSource/openxal,EuropeanSpallationSource/openxal,luxiaohan/openxal-csns-luxh,EuropeanSpallationSource/openxal,openxal/openxal,openxal/openxal,EuropeanSpallationSource/openxal,EuropeanSpallationSource/openxal,openxal/openxal