merge in multi-node packstack work to master

Change-Id: Id4282819e2683c7a0a537fdf1aba99caf7753180