Remove href_change and navigate from wait action

tools/perf/page_sets/gmail_alt_threadlist_conversation.json

 {
   "description": "Chrome Endure test for GMail.",
   "archive_data_file": "data/gmail_alt_threadlist_conversation.json",
   "credentials_path": "data/credentials.json",
   "user_agent_type": "desktop",
   "pages": [
     {
       "url": "https://mail.google.com/mail/",
       "name": "gmail_alt_threadlist_conversation",
       "why": "Alternate between Inbox and the first email conversation",
       "credentials": "google",
       "navigate_steps" : [
         { "action": "navigate" },
         { "action": "wait", "javascript": "window.gmonkey !== undefined && document.getElementById('gb') !== null" }
       ],
       "endure": [
         {
           "action": "javascript_click",
-          "xpath": "//span[@email]"
+          "xpath": "//span[@email]",
+          "wait_until" : { "condition" : "href_change" }
         },
-        { "action": "wait", "condition": "href_change" },
         { "action": "wait", "seconds": 1 },
         {
           "action": "javascript_click",
-          "selector": "a[href=\"https://mail.google.com/mail/u/0/?shva=1#inbox\"]"
+          "selector": "a[href=\"https://mail.google.com/mail/u/0/?shva=1#inbox\"]",
+          "wait_until" : { "condition" : "href_change" }
         },
-        { "action": "wait", "condition": "href_change" },
         { "action": "wait", "seconds": 1 }
       ]
     }
   ]
 }