Fixes to accomadate latest upgrade_contrail task changes.

Change-Id: Ie310bc22fc79b9b605ea543ae6fb73ca9f840a7a