Code cleanup for ticket plugin (2) - refs #6715