Merge pull request #3388 from jim-parry/fix/deprecation

Flag the smiley helper and shopping cart as deprecated.