fix some REST urls to be p5 compatible
differentiate between biserver 5 and before integration - should be changed to other integration mode
Merge branch 'master' into viz