add minimal test kitchen support
11.6 erubis compat - let's just remove the node attribute

There is really no reason to have the node's fqdn rendered in the
template. If you're on the system to view the content of the rendered
file, you can probably run 'ohai fqdn' or 'hostname -f'.
Merge branch 'COOK-3399'
release v2.1.4
increment version for development
Merge branch 'upstream' into jenkins-upstream-11

Conflicts:
	.gitignore
	.kitchen.yml
	Berksfile