Merge branch 'release/7.x-1.15' into develop
Refactoring for openagency 2.6 (branchName)
updated to version 7.x-1.16
Merge branch 'release/7.x-1.16'