o.c.common.trenplotter: Parser for STATE String
Merge remote-tracking branch 'origin/rel15x' into rel15x