Submitting additional code changes needed to packaging that are needed along with
    contrail server manager code sync from R1.10 to master (commit id :
    https://github.com/Juniper/contrail-server-manager/commit/1c558792c7786c592f393fbe74f183e22b7ae0fb)

Change-Id: Id59e18418c3e56a936a0b7f2e167f8a0201f8562