For jboss 7 the instance configuration directory is 'configuration' not 'conf'
Merge pull request #27 from signed/jboss7_configuration_directory

For jboss 7 the instance configuration directory is 'configuration' not 'conf'
Merge branch 'master' into jboss-7-instance
moved the complete configuration argument to the variable assignment
Merge branch 'jboss-7-instance' into jboss-7-instance-admin-console-binding

Conflicts:
	templates/jboss7.init-instance.erb