Remove trove and tempest barclamps

Remove trove and tempest barclamps during first upgrade step, if present