SIO-1227 - Fix error 500 for some urls without trailing slash

Change-Id: I0737a3eb0186c3b9eea2c41e4f8e0fc2d2afe4e1
Merge "SIO-1227 - Fix error 500 for some urls without trailing slash"