Merge branch '2.5.x' into cc-5709-airtime-analyzer

Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml
Merge branch '2.5.x' into cc-5709-airtime-analyzer
Reworked upstart config for airtime_analyzer
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
Merge branch '2.5.x' into saas
CC-5929: Certain long filenames can result in the extension getting cut off
Merge branch 'cc-5709-airtime-analyzer' into saas
Fix invalid python in StatusReporter
Merge branch 'cc-5709-airtime-analyzer' into saas
Merge branch '2.5.x' into saas
Fix rare exception during shutdown in airtime_analyzer
StatusReporter exception handler to prevent thread from dying under any circumstances
Merge branch 'cc-5709-airtime-analyzer' into saas
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
Support for tokens in multipart file upload using API.
Merge pull request #74 from RobertElder/saas-relder-multipart-tokens

Support for tokens in multipart file upload using API.
Merging 2.5.x into saas