[FIX] Fixing NM tag computation in mason_simulator.
[FEATURE] Mason correctly writes out XS, XE, XI tags.
Merge branch 'fix/mason2_nm' into develop

Conflicts:
	extras/apps/mason2/tests/simulator.out1.sam
	extras/apps/mason2/tests/simulator.out2.sam
	extras/apps/mason2/tests/simulator.out4.sam
	extras/apps/mason2/tests/simulator.out7.sam