Activate -I in pkg upgrade for real
Better testing of flags
Fix regression preventing upgrade from running post-install