Added support for reserved variable expansion in URI templates