Add support for additional cost elements#1849

ateirney wants to merge 2 commits intogoogle:maingoogle/or-tools:mainfrom

ateirney:feat/support-extra-costsateirney/or-tools:feat/support-extra-costsCopy head branch name to clipboard