Added support for reserved variable expansion in URI templates

Moving this to a topic branch.