Israel, it's about time!

[Mourhelm]

What if the soldier has a gun on him? Is it still a civilian target?

Of course it's still a civilian target.

If a terrorist comes to bomb your house and a soldier comes to help you, will you consider your house a military target?

I will only consider a bus station (or house) as a military target if it has a military purpose (like storing rockets).