Merge "Fix webapp path parsing" into feature/zuulv3