516412 - Code cleanup before migrating to Equinox 1.10.2

Change-Id: I28bb50456861d2a1ef7bc0214c015e4600b6e84d
31 files changed