Additional fixes for BZ#1091776 - MainFile attribute in publican.cfg causes issues.