integrated upgrade to deltacloud, some more refactorings