[sr-dev] git:3.3: Ported gruu and outbound changes to p_usrloc module