Merge create and update plans

[richardcase]

Describe the solution you'd like:
Merge the create and update plans to a single plan builder.

AC:

• Merge the create and update plans to a single plan builder.
• Capture the decision to keep plans separate and simply merge the create/update plans.

Anything else you would like to add:
[Miscellaneous information that will assist in solving the issue.]

[jmickey]

TODO: Update ticket:

1. Keep separate plans
2. Merge create and update
3. Capture decision