Squashed 'scripts/upandaway/wicker/' changes from 21fdd39..bd83c50

bd83c50 bug fixed in cfg

git-subtree-dir: scripts/upandaway/wicker
git-subtree-split: bd83c5055a704e0af2440e7a1c8f095462739dac
Bug fixes.