Merge "Removing STOPSHIP comment that is not needed (per bug)." into lmp-mr1-dev