Rename machine from hipos-kirkwood to hikirk.

The patch changes the template for local.conf accordingly.

HYP-7326

Signed-off-by: Angelika Tobisch <tobisch@dresearch-fe.de>
Merge branch 'master' into dora

Signed-off-by: Mario Schuknecht <schuknecht@dresearch-fe.de>

Conflicts:
	local.conf.template