Merging XPE branch: step 1

Merged in modified node-bootstrap while retaining current directory
layout. This uses the configuration based docker registry alone in
order to get to an initial working state.
Merging XPE branch: step 2

Integrated XPE infra-bootstrap into node-bootstrap so it can
now also start an etcd container. This simplifies matters as
we no longer have to piggyback stuff across etcd.