Fix Gherkin lint issues

Author: ernilambar

features/comment-meta.feature

@@ -80,4 +80,3 @@ Feature: Manage comment custom fields
       | 1          | apple    | banana             |
       | 1          | apple    | banana             |
       | 1          | banana   | ["apple","apple"]  |
-

features/menu-item.feature

@@ -65,7 +65,7 @@ Feature: Manage WordPress menu items
       Success: Deleted 1 of 1 menu items.
       """
     And I run `wp menu item list sidebar-menu --format=count`
-    Then STDOUT should be:
+    And STDOUT should be:
       """
       2
       """
@@ -76,7 +76,7 @@ Feature: Manage WordPress menu items
       Success: Deleted 2 of 2 menu items.
       """
     And I run `wp menu item list sidebar-menu --format=count`
-    Then STDOUT should be:
+    And STDOUT should be:
       """
       0
       """
@@ -103,8 +103,7 @@ Feature: Manage WordPress menu items
       | Child       | {CHILD_ID}       | {PARENT_ID}      |
 
     When I run `wp menu item delete {PARENT_ID}`
-
-    When I run `wp menu item list grandparent-test --fields=title,db_id,menu_item_parent`
+    And I run `wp menu item list grandparent-test --fields=title,db_id,menu_item_parent`
     Then STDOUT should be a table containing rows:
       | title       | db_id            | menu_item_parent |
       | Grandparent | {GRANDPARENT_ID} | 0                |

features/option-list.feature

@@ -143,7 +143,7 @@ Feature: List WordPress options
     Then STDOUT should be:
       """
       ---
-      - 
+      -
         option_name: sample_test_field_one
         option_value:
           value: 1
@@ -197,4 +197,4 @@ Feature: List WordPress options
     And STDOUT should contain:
       """
       sample_value_four
-      """
+      """

features/option-pluck-patch.feature

@@ -319,7 +319,7 @@ Feature: Option commands have pluck and patch.
     And the return code should be 1
 
     When I run `wp option patch update option_name foo 0`
-    And STDOUT should be:
+    Then STDOUT should be:
       """
       Success: Updated 'option_name' option.
       """

features/option.feature

@@ -106,7 +106,6 @@ Feature: Manage WordPress options
       0
       """
 
-
     # JSON values
     When I run `wp option set json_opt '[ 1, 2 ]' --format=json`
     Then STDOUT should not be empty
@@ -120,7 +119,6 @@ Feature: Manage WordPress options
       [1,2]
       """
 
-
     # Reading from files
     Given a value.json file:
       """
@@ -182,7 +180,6 @@ Feature: Manage WordPress options
       | option_name  | option_value   | autoload |
       | hello        | island         | on      |
 
-
   @require-wp-4.2
   @less-than-wp-6.6
   Scenario: Managed autoloaded options