Fixes Java installation in vagrant.
Merge pull request #1092 from AdrianGaudebert/vagrant-fix-java-install

Fixes Java installation in vagrant.
Harmonized collector.wsgi with middleware.wsgi : if a config file in /etc/socorro exists, it is chosen first