Fix template replacement order

[Adrodoc]

Currently some template replacements are only done incidentally. For instance # -commands- in the validate template gets replaced with commands containing -ns- which is then later replaced with the actual namespace. This only works because we use a BTreeMap and the UTF-8 value of # is smaller than the value of -, so # -commands- is replaced first. This replacement should not rely on such implicit ordering.