Partial cleanup of the ticket plugin - refs #6715
Merge remote-tracking branch 'origin/1.9.x' into 1.9.x