fix bug 534: portfolio define-fun duplicate model
Merge branch 'master' of https://github.com/CVC4/CVC4