Merge branch 'revert_pr14' into devel
Merge branch 'test_fixes' into devel
add init_timeout parameter to jboss::instance define

Allows a default init script stop timeout (in seconds) to be set.
Merge branch 'init_timeout' of https://github.com/jhoblitt/puppet-jboss into jhoblitt-init_timeout