Squashed 'scripts/upandaway/wicker/' changes from 514bc0b..12ed4f0

12ed4f0 argh. I guess this is it.

git-subtree-dir: scripts/upandaway/wicker
git-subtree-split: 12ed4f0089161e0971266046dfdb8b4b0bb5d89c
same