Merge "java/security: remove system.scope from security.properties"