WTP 3.0.5 Patches

Bug 280483. "A handler conflict occurred. This may disable some commands." warning on restart

Bug 285284. Removing comment end tag and adding it back leaves validation errors