MARMOTTA-579: Do not use hard-coded path for /tmp, use java system property instead.
Some minor code-cleanup (License-Headers should not be javadoc-comments)