fix conflict specification included in module files, should use short module name obtain from active module naming scheme
add unit test for toolchain definition verification
fix test_descr unit test w.r.t. spacing in 'conflict' line
get rid of module_software_name method in ModulesTool, verify toolchain definition vs loaded toolchain module differently
fix remarks
fix remark w.r.t. regex for 'module load'
fix small remark w.r.t. log error in HierarchicalMNS
Merge branch 'develop' into fix_conflicts

Conflicts:
	easybuild/framework/easyblock.py
	easybuild/tools/module_naming_scheme/hierarchical_mns.py
	easybuild/tools/modules.py
	test/framework/modules.py
fix merge conflict resolution failure
Merge branch 'develop' into fix_conflicts
add is_module_for method to module naming scheme API, and use it to verify toolchain definition based on module names
add unit test for is_module_for method, fix test module naming schemes
fix remark w.r.t. name of method, renamed to is_short_modname_for
rename mns method to is_short_modname_for
Merge pull request #1017 from boegel/fix_conflicts

fix conflict specification included in module files