resolve merge conflict from 283a59a
Merge branch 'COOK-2422'
[COOK-2421] - commit 20a9dd3b has other changes
Added CATALINA_OPTS
[COOK-2838] Fix foodcritic warnings
Merge pull request #16 from bflad/catalina_options

[COOK-2736] Added CATALINA_OPTS
Merge pull request #17 from opscode-cookbooks/ssd/COOK-2838

[COOK-2838] Fix foodcritic warnings
Add support for proxy ports
Add SSL support
Support not deploying manager apps
Add endorsed library directory support
Fix typo - should use 'node' rather than 'default' to access attributes
Switch attribute style to array
Randomly generate passwords for certs, update docs
Merge branch 'COOK-2425'
update test kitchen support for 1.0
resolve foodcritic warnings