EF didn't pick up the rename before commit.
DefaultWorkflowActionAttributes migration class didn't get renamed either
regen'd the DefaultWorkflowActionAttributes migration (the Designer file still had it as WorkflowActionAttributes)
Merge branch 'origin/develop'

Conflicts:
	Rock/Rock.csproj