Merge "Add trailing slash to context URIs"