[PATCH 0/6] binman: Template fixes and improvements