Upgrade Docker to 1.3.2

Also fix an ordering issue in salt and an extra common in an example JSON.  This makes the e2e test run better/faster.