Merge branch 'stable-4.6' into stable-4.7

* stable-4.6:
  Update Oxygen Orbit p2 repository to R20170516192513
  Fix exception handling for opening bitmap index files

Change-Id: I669fe48ce0034f9ea1977d38ee39099497422c1c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
index 1d537e6d71fc365c35ee82b8a13a2abbb898c229,d0da0c4153aa357b3d47591cb668e10660b169d2..be02826e8ecb58cb9363ce75e2f657ef122c3a41
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
- <target name="jgit-4.5" sequenceNumber="1491140572">
 -<target name="jgit-4.5" sequenceNumber="1502746491">
++<target name="jgit-4.5" sequenceNumber="1502747250">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
index babcf0928b085f037b12989248bdfde6e218a30f,065284de19babc6825763f3716b993446e7b7c8e..bcef50bd36948c21ff8f32938ceefe2cd651eeae
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
- <target name="jgit-4.6" sequenceNumber="1491140561">
 -<target name="jgit-4.6" sequenceNumber="1502746433">
++<target name="jgit-4.6" sequenceNumber="1502747233">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
index 5e4f5558f272569248b2720bdf50c85288d326bd,d3a11314fbe16a90a62ea6d73d04b9a8069bc3a3..52ea6f81aabdd6629d128e353e82a48d9b6fe8e4
--- 1/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
--- 2/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <?pde?>
  <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
- <target name="jgit-4.7" sequenceNumber="1491140544">
 -<target name="jgit-4.7" sequenceNumber="1502746477">
++<target name="jgit-4.7" sequenceNumber="1502747215">
    <locations>
      <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
        <unit id="org.eclipse.jetty.client" version="9.3.17.v20170317"/>

diff --cc org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java
Simple merge