Merge "updates for R3 packaging improvements SO and UI do not have to share build and runtime containers"