BK-1232 editor_license.url may not be NULL when running tests
Merge branch 'BK1232' into 2.0