Merge pull request #229 from nhr/ha_tweaked

Fixed typo
Trying to make more flexible template logic
Merge pull request #230 from nhr/array_protection

Array protection
Merge pull request #231 from nhr/array_protection

Trying to make more flexible template logic
More robust handling of arrays that may be parsed as strings
Merge pull request #233 from nhr/improved_array_protection

Improved array protection
Excessive but operable array tests
Merge pull request #235 from nhr/more_array_work_mb

Excessive but operable array tests
Updated template files to match v4 Broker config
Merge pull request #237 from nhr/template_fixes

Updated template files to match v4 Broker config
Per feedback disabling direct_addressing
Merge pull request #238 from nhr/mcollective_settings

Per feedback disabling direct_addressing
Re-enable LDAP auth plugin
Merge pull request #241 from detiber/reenableLDAPAuth

Looks good. Thanks!