Fix issue with ImagesOneServerJSON test

ImagesOneServerTestJSON using wrong client for checking server status.

Change-Id: I738318d32bd82329eecd54e469aa84bc9ebea15c
Closes-Bug: #1242903
(cherry picked from commit 62c1d9c4259b410930966356bbb00df2fd82a03d)
Add special serial smoke option

We want smoketests to be parallel by default (for grenade etc), but that won't work
for neutron, so add a special case. Since we don't want to break
anything making this switch, it has to be done in 3 steps:

1) this patch
2) make neutron use smoke-serial
3) change smoke to be parallel

Change-Id: I03ded120c0b496026e39f14f6715624a91ac7558