Fixes issues resulting from merge conflicts.

Planning element step definitions were badly merged and are now back in
a consistent state.