Merge "Moving shared classes to common.pip package 3/N" into udc-qpr-dev