Merge "Added lines to local.conf for Metadata configuration"