#126259 by eferraiuolo - fix variable name to be consistent between the settings form and it's usage

Issue #38516, make nodes in blocks optional. Introducing several options: show none, show all, show promoted, and show sticky.

Issue #70839, only show promoted. Changing defaults to be consistent--previously two different defaults were fed to the variable_get(). (Previous commit was for adding links.)

Issue #80338, highly modified version of original patch by Richard Eriksson, add 'edit' links for terms and vocabularies.

 generation code.

Rolling back changes that were made for themability, as they broke many things (block, breadcrumbs...). This may be a step backward in terms of code elegance but required for regaining functionality. Perhaps we can reintroduce working versions of the previous changes.

Updating with modified version from 4.7. I'm now going to roll back 4.7 as it is broken. It can be returned to this code once this code works.