SMK-539 checkstyle errors clean up, cherrypick DynamicUrlController