fixed two slashes
Merge branch 'MWEB-1047' into release-10
fixed unit tests after fixing P2