Merge "Don't insert entries with trailing slash" into nyc-mr1-dev