Merge "Allow aai-docker to specify node"

diff --cc jjb/aai/aai-babel.yaml
Simple merge

diff --cc jjb/aai/aai-chameleon.yaml
Simple merge

diff --cc jjb/aai/aai-champ.yaml
Simple merge

diff --cc jjb/aai/aai-data-router.yaml
Simple merge

diff --cc jjb/aai/aai-gizmo.yaml
Simple merge

diff --cc jjb/aai/aai-model-loader.yaml
Simple merge

diff --cc jjb/aai/aai-search-data-service.yaml
Simple merge

diff --cc jjb/aai/aai-sparky-be.yaml
Simple merge

diff --cc jjb/aai/aai-spike.yaml
Simple merge

diff --cc jjb/cli/cli.yaml
Simple merge