make selfLink namespace aware
Merge pull request #2568 from derekwaynecarr/self_link_ns

make selfLink namespace aware