Mark the "step over single instruction" plan private in the StopInfoWatchpoint::PerformAction to

ensure that the watchpoint not the step is reported as the stop reason.  Also, stash away & restore
the current stop reason just so it can't go away on us.

llvm-svn: 185474