Manual merge of @ben-ebersole pull request to add gazebo parameters