Merge branch 'backport' into 3.4-working

diff --cc data/rc.xml
Simple merge

diff --cc data/rc.xsd
Simple merge

diff --cc openbox/actions/cyclewindows.c
Simple merge

diff --cc openbox/actions/directionalwindows.c
Simple merge

diff --cc openbox/config.c
Simple merge