So I merged the upstream. However if I squash it as well, the conflict with the upstream will arise again. So I've left it be for now.
--- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds-labs/pull/233#issuecomment-187187622
