Add an option agent name
Merge branch 'agent-names' into di

Conflicts:
	attributes/plugin-agent.rb