shorten the code
Conflict resolved
bug fixed
Fixed wrong type declaration
Simplified URL normalization
Revert saving job JDL
Merge pull request #2156 from atsareg/fix-v7r0

[v7r0] Several fixes