Merge "Drop use of 'oslo' namespace package"