fix bug 1049796 - need Unknown in os_names table for JOIN that update_reports_clean() does
Fixes bug 1055538 - Removed the form_field_type option from Super Search fields.
fix bug 1056025 and fix bug 1037855 - rename Fennec->FennecAndroid and Webapp Runtime -> WebappRuntime as appropriate
dry
import datetime
fix test
Merge pull request #2307 from rhelmer/bug1056025-map-fennec-to-fennecandroid

fix bug 1056025 and fix bug 1037855 - rename Fennec->FennecAndroid and W...
Merge pull request #2304 from AdrianGaudebert/1055538-remove-form_field_type

Fixes bug 1055538 - Removed the form_field_type option from Super Search fields.
fixes bug 1053853 - django 1.4.14/1.5.9/1.6.6 security update (Socorro)
Merge pull request #2309 from peterbe/bug-1053853-django-1414159166-security-update-socorro

fixes bug 1053853 - django 1.4.14/1.5.9/1.6.6 security update (Socorro)
Fixes bug 1039969 - SuperSearch API now considers all arguments as lists.
Fix Bug 1035336, fix jQueryUI spaghetti and upgrade to latest
Merge pull request #2306 from ossreleasefeed/bug1035336-cleanup-jquery-ui-spaghetti

Fix Bug 1035336, fix jQueryUI spaghetti and upgrade to latest
Merge pull request #2310 from AdrianGaudebert/1039969-api-supersearch-fields-are-lists

Fixes bug 1039969 - SuperSearch API now considers all arguments as lists.
fix bug 1055948 - adjust start time of ADI dependent jobs
fix bug 1058226 - Bootstrap webapp-django Once

Replaces jenkins-tests with jenkins script in webapp,
since 'bin/jenkins.sh' is not being used elsewhere.

This will stop webapp being bootstraped twice. Once in
'scripts/bootstrap.sh' and second in 'scripts/test.sh'
Add java develoment libs to vagrant box.
Rename 'jenkins.sh' to 'ci.sh' in webapp-django

As we use both Jenkins and Travis for CI, having the script specifically
called 'jenkins.sh' doesn't make sense.

fix bug 1058226
Fix reference to webapp-django jenkins script.

Updates comment in webapp-django bootstrap.sh regarding enabling of
offline compression in local settings.

fix bug 1058226
Add JAVA_HOME to build.sh

Only updates PATH if not on Jenkins or Travis-CI.

JAVA_HOME is missing '/bin' because PATH requires 'bin' directories,
yet some applications use JAVA_HOME to access other resources from
Java.

fix bug 1054557