[models] Bug 453965: NPE with file model repo and proxy

Signed-off-by: Johannes Dorn <johannes.dorn@codetrails.com>
[releng] Build against EGit 3.6 (and soon 4.0) nightly update site

Change-Id: I54536e3cccde21dfb3061696a1df0c3a95e6c7cd
Signed-off-by: Andreas Sewe <andreas.sewe@codetrails.com>
Merge "[releng] Build against EGit 3.6 (and soon 4.0) nightly update site"