Merge "Time service / strategy config refactoring" into udc-qpr-dev