Fix "clean" target
Move dita-ot macrodef back into main buildfile
Add fixtures for 1672