[BISERVER-11583] Fixes for ensuring node names are being encoded when as...

...sembled