Rebase instead of merge in upstream changes to local fluid apps dir