Merge "fuel: Specify upstream/opnfv branches separately and use include scripts"