LPS-47668 Process extra headers
LPS-47668 SF
Revert "Temp disable SFormatter for java terms since it breaks registry-api"

This reverts commit dc2b740c42848f7aa7dc8e147965a2af13a13c5f.
Ignore ServiceTrackerMapFactory.java while sorting javaterms as it's breaking SF. Will work on properly fixing SF