This ensures that option expressions are resolved in the project
level overrides before attempting to composite them on the instantiated
elements. Seems this is a regression from introducing the include
directive.

This fixes issue #658

This is a regression test for issue #658

Fix override options 1.2

See merge request !803