Aborted build stays in queue after new gerrit patchset is created

Patchset "A" is created in a gerrit review and a build is put in the Jenkins build queue. If patchset "B" is created before patchset "A" builds, the build for patchset "A" is aborted but it stays in the jenkins build queue and never clears out.  This can cause us to have over a 100 jobs queued up that will never build or be removed from the queue.