Merge "cleanup. waitForCondition() now uses polymorphsim instead of templtes" into kraken