Some reformatting and setting packaging of tr.snaa-certificate-organization-service once again to 'war'