Issues1232and2937transition

@lloyd - Could you review this one?

I added one commit that can be later reverted that adds the transition code necessary to rollback gracefully.