SotBE S2: adjust starting villages

So that they are more consistent with the situation at the end of the
previous scenario.
SotBE S2: end scenario if Kapou'e is already at signpost

… when the messenger reappears.  Previously, one would have had to move
Kapou’e off the post and back onto it.
SotBE S3: make the two sets of objectives consistent with each other

This does not add any strings.