Merge "Resources: Consistently use base paths without trailing '/'"