(Bug 3081) pic# icon keywords can now be renamed
(Bug3081) Removed some debugging lines.
(Bug 3081) Fixing of case were a default keyword is changed, but not renamed.
(Bug3081) Bringing into line with coding standards.
(Bug 3081) Previous commit had an edge case where if someone had blanked a keyword
and then restored it, the old keyword would be lost.  This is fixed.
(Bug 3081) Fixing the SQL from the last commit.
Merge pull request #402 from annariel/Bug3081

Bug3081 Allow renaming pic#xxx keywords