Ignoring the tests for Distriman (because it is not used, tests takes long times and fails on low level networks errors)
German fixed the issue #149 (ApAM does not start properly all the time), related to a JVM issue deadlock, fixing with jvm args on java 6 (java 7 should be ok)
manual merging the file