Merge branch 'stable-3.2' * stable-3.2: ValidatorConfig: Fix wrong package for stable-3.2 ValidatorConfig: Adapt package again to latest master. Change-Id: I62cf8c34fff085db59764e05b93f35ab34d236dc