Remove gone_in for issue 11859 (deprecation of --build-option and --global-option)

Remove gone_in for issue 11859 (deprecation of --build-option and --global-option) #6383