Branch 'taskomatic' - 17 commits - java/code schema/spacewalk