update imports
added layout option for provconvert
removed duplication of prefix declarations in expander
Merge remote-tracking branch 'upstream/template' into template