add some code to return URL to old format (before monitoring -> metrics change)
merge with master
bug fix to be compatible with old versions
changes after code review
bug fix
Merge pull request #447 from dlatnikov/JFG_681_return_old_url_format

Jfg 681 return old url format