Add kwargs support to upgrade macro.
Macro kwargs can be bypasses using -y.