Making supervisor ini files of contrail-api and contrail-discovery in sync

supervisor ini files for contrail-api and contrail-discovery in the contrail-controller
repo are outdated, Making it in sync with the way we edit/populate the ini files during provisioning.

Change-Id: I124a451f7f145b92a933398a9e06671b6f0efd75
Closes-Bug: 1380890
Merge "Making supervisor ini files of contrail-api and contrail-discovery in sync" into R2.0