Merge branch 'release/v4.0' into feature/datamodel
Fix: config field 'host' overlapped with Splunk default field 'host'.  Changed to 'client_ip'.  Changed 'client' to 'client_type'.
Add a few fields to wildfire_report for easier integration with data model
Fully accelerated Splunk 6 data model
All SimpleXML dashboards updated to use data model instead of tsidx.  This removes dependency on tsidx indexes and the saved searches that create them.
Remove all TSIDX collection searches.  They are obsolete in Splunk 6 because Accelerated Data Models supersede the TSIDX capabilities.
Enabled data model acceleration for 1 year by default.
Fix traffic dashboard populating drop downs from wrong data model object
System dashboard: change order of table fields so description doesn't edge out the other fields.
WildFire Dashboard: fix form issues.  Use new 'User' field in data model.
Datamodel: hide duplicate or unnecessary fields from data model.
Dashboard fixes
Rename WildFire report retrieval saved search for clarity.
Merge branch 'hotfix/v4.0.1'
Traffic Dashboard: fixed issue with form values causing error about invalid WHERE clause
Merge branch 'hotfix/v4.0.2' into develop
Merge branch 'feature/datamodel' into develop

Conflicts:
	default/data/ui/views/config_overview.xml
	default/data/ui/views/traffic_overview.xml
	default/savedsearches.conf