Merge "Add protolog config as java resource" into sc-dev