fix NPE in BundleContextHistoryManagerTest
Merge branch 'space/14.1'