Do (message-broker|search-index)/update earlier

Travis was timing out waiting for those tasks to complete.