Merge "Enable neutron trunk ports" into stable/euphrates