include discover parameters under one if statement, implement feature...

include discover parameters under one if statement, implement feature negotiation in API Provider Enrollment Details