Refs #6795, add --iis-map-field option to allow users of log importer script to parse log files created using the IIS Advanced Logging module. Includes tests for such a case (including python unit test + PHP System test).
Refs #4707, add test for netscaler logs, support already present due to last commit.
Refs #5980, parse cs-username variable in IIS logs and use as userid when present and not anonymous. Includes changes to ImportLogsTest.
refs #6807 sort sparklines depending on the column that is selected in evolution column
Add netscaler logs to python tests for log importer.
Refs #6388, map IIS time-taken field to gneration time in log importer.
Merge branch 'master' into iis_advanced_log_importing

Conflicts:
	tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
	tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
	tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
	tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
	tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml
Merge pull request #6825 from piwik/iis_advanced_log_importing

Added IIS advanced log importing support, netscaler log importing support, support for cs-username IIS log field and time-taken IIS log field to log importer script.
2.10.0-b6
Fixes #6830 If timestamp success fetched from DB is in the future, we set it to now
Refs #4707, add note in log importer README about netscaler log files.
If xdebug code coverage is enabled, write comment when running tests
Fixes #6835 and remove some phpstorm warnings
reuse $row->getSubtable() as much as possible instead of callng Manager::getInstance()->getTable which can throw exception refs #3414
Tweak exception message
adding @group tag
Remove code that we're not sure why it's here
Make sure not to fail in getSubtable()
Fixes #5178, enable STRICT_TRANS_TABLES in travis and fix remaining tests that do not pass w/ this mysql setting. Includes fixes to PrivacyManager plugin and fix for tracker when non-unicode site search keyword is stored in the DB (instead of storing the data as non-utf strings, we store the data as urlencoded if the keyword is not valid utf-8).
.travis.yml file is out of date, auto-updating .travis.yml file.