Login z2 server use machine from a z2 resource pool.

Signed-off-by: Kai Zhang <kaizhang@cn.ibm.com>
Merge remote-tracking branch 'upstream/develop' into develop