fix NPE in BundleContextHistoryManagerTest
Merge branch 'space/14.1'
Merge remote-tracking branch 'origin/master' into pjsm/2.0