[PATCH 04/14] lnst-ctl: More XML format changes