Merge "Add opencontrail_node_role parameter for contrail nodes"