Synch with conf files from origin-server/master

Pull in changes to configuration files in origin-server/master and fix
some small errors.

templates/broker/broker.conf.erb: Add settings VALID_SSH_KEY_TYPES,
DEFAULT_MAX_DOMAINS, DEFAULT_ALLOW_HA (set to true because the Puppet
template already has ALLOW_HA_APPLICATIONS set to true),
MONGO_WRITE_REPLICAS, CART_DOWNLOAD_CONN_TIMEOUT, HTTP_PROXY,
MAX_MEMBERS_PER_RESOURCE, HA_DNS_PREFIX, HA_DNS_SUFFIX,
ALLOW_OBSOLETE_CARTRIDGES, ALLOW_ALIAS_IN_DOMAIN, and SYSLOG_ENABLED;
deleted MONGO_REPLICA_SETS setting; and update comment for
MONGO_HOST_PORT to indicate it is delimited by commas, not by spaces.

templates/broker/msg-broker-mcollective.conf.erb: Add comments, update
MCOLLECTIVE_TIMEOUT setting, use proper Booleans (true and false) instead
of integers, add MCOLLECTIVE_FACT_TIMEOUT, change NODE_PROFILE_ENABLED to
true, and add ZONES_REQUIRE_FOR_APP_CREATE and ZONES_MIN_PER_GEAR_GROUP.

templates/broker/plugins/auth/mongo/mongo.conf.plugin.erb: Add comments and
delete MONGO_COLLECTION.

templates/broker/plugins/dns/avahi/cname-manager.conf.erb:
Use ::openshift_origin::domain for KEY_NAME and
::openshift_origin::bind_key for KEY_VALUE.

templates/broker/plugins/dns/nsupdate/nsupdate-kerb.conf.erb: Add comments.

templates/broker/plugins/dns/nsupdate/nsupdate.conf.erb: Add comments and
add BIND_KEYALGORITHM.

templates/console/console.conf.erb: Synch comments; delete DOMAIN_SUFFIX;
and add DEFAULT_URL_OPTIONS_HOST, DEFAULT_URL_OPTIONS_PORT, ASSET_HOST, and
SYSLOG_ENABLED.

templates/console/plugins/auth/kerberos/openshift-origin-auth-remote-user-kerberos.conf.erb:
Add KrbLocalUserMapping.

templates/node/node.conf.erb: Synch comments; delete INSTANCE_ID; change
GEAR_MAX_UID setting to 6999; change GEAR_SUPL_GRPS to
GEAR_SUPPLEMENTARY_GROUPS; fix setting for APACHE_ACCESS_LOG to be
/var/log/httpd/openshift_log instead of access_log; and add
LIBVIRT_PRIVATE_IP_RANGE, LIBVIRT_PRIVATE_IP_ROUTE, LIBVIRT_PRIVATE_IP_GW,
QUOTA_WARNING_PERCENT, REPORT_BUILD_ANALYTICS, and MOTD_FILE settings.

templates/plugins/frontend/apache_mod_rewrite/node_routes.txt.erb: add EOL
to the last line.