DATAREST-301 - Fixed location header creation for self links containing URI templates.

We now consistently expand the self links created before adding them as location header to make sure we can create a URI instance successfully.