Upgrade honors build_bottle? and built_as_bottle options

Closes #31628.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>