Merge "Adds nosdn-noha scenario and fixes opencontrail scenario naming"