Merge "Add configuration to enable/disable L7,L4 protocols"