upgrade from 2.20 64 to 65 or later causes discovery to fail

[Vedamurthy Joshi]

R2.20 Build 71

Tried ugprade from 2.20 Build 60 to 71

contrail-discovery and contrail-svc-monitor failed to start

Prakash helped to identify that it failed to start due to port-in-use (5998)

The below checkin removed the listen-port argument while starting discovery. So discovery tried to start on 5998 instead of 9110

https://github.com/Juniper/contrail-controller/commit/6037a8d54cce0daf2599434f892f7c316f4b3500

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/12904
Submitter: Shweta Naik (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/12904
Committed: http://github.org/Juniper/contrail-provisioning/commit/62919b5175ec4fc3bf8fdab5060896d5cd37b09d
Submitter: Zuul
Branch: R2.20

commit 62919b5175ec4fc3bf8fdab5060896d5cd37b09d
Author: Shweta Naik <email address hidden>
Date: Thu Aug 6 16:04:36 2015 -0700

Backing up and restoring all the .conf and .ini files that we change
during provisioning before and after upgrade resp.
Closes-Bug:#1477424

Change-Id: Ide43c2a1a9f5d0c3e260e27c9c0df4a696002063

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/13532
Submitter: Shweta Naik (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/13532
Committed: http://github.org/Juniper/contrail-provisioning/commit/7497bb2b2cb02d11a6d23890492cf909a41f04f3
Submitter: Zuul
Branch: master

commit 7497bb2b2cb02d11a6d23890492cf909a41f04f3
Author: Shweta Naik <email address hidden>
Date: Wed Sep 2 14:56:37 2015 -0700

Modifying the restore section as per the release.
Closes-Bug:1485064
Backing up and restoring all the .conf and .ini files that we change
during provisioning before and after upgrade resp.
Closes-Bug:1477424

Change-Id: Ieaa0e496571cc149d6a69c8bfce38ff07c1f6ec3
(cherry picked from commit c9372a1ebde150ae1734d75e1fba491082f48127)
(cherry picked from commit 62919b5175ec4fc3bf8fdab5060896d5cd37b09d)