Various updates in preparation for Z3 version update#585

marcoeilers wants to merge 3 commits into

masterviperproject/carbon:masterfrom

meilers_z3_416viperproject/carbon:meilers_z3_416Copy head branch name to clipboard