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