Release 2.5.0#25

lmakarov merged 2 commits into

masterdocksal/service-apache:masterfrom

developdocksal/service-apache:developCopy head branch name to clipboard