Merge branch 'tristan/backport-junction-includes' into 'bst-1'

Process options in includes files with the options of their junction

See merge request BuildStream/buildstream!1912