fixed osgi tab so the new services UI works nicely
Merge remote-tracking branch 'upstream/master'