CLEANUP_OPTIONS: Restore the resulting directory structure of ktest

Warn: This temporarily does not support the 'title' attribute.
Merge remote-tracking branch 'upstream/master'