remove two properties for gridtrajectorycontrol
Merge remote-tracking branch 'origin/master'