Clean up of redundant FS Content locators

P2 plugin CL was already marked as "removed once update core"
but since squash of modules it's already done.

There were 3 copies for FS CL, all equal. Now, the P2
copy removed, and FS LS one deprecated.