Bump versions; cherry pick 9d997506 from master.

Revert staged generator PRs (#2329)

* Revert "updating README examples with Make changes (#2322)"

This reverts commit 875dcd3e.

* Revert "fixing aspect generation (#2309)"

This reverts commit bbeb2578.

* Revert "separate generator behavior into phases (#2274)"

This reverts commit 9d997506.

(cherry picked from commit e170f8f8)