XD-1520: xd stream name push

Changed the last remaining ${foo:${xd.stream.name}} to have it as the default, so it is now properly reported using module info

Have a look at individual commits for easier review