Merge "Make InvalidServiceTag inherit from TempestException"