TEIIDDES-1747 fix NPE, indents, and add workaround for creation of site_assembly.zip