Merge "Allow docker-java to specify node"

diff --cc jjb/aai/aai-esr-gui.yaml
Simple merge

diff --cc jjb/aai/aai-esr-server.yaml
Simple merge

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

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

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

diff --cc jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
Simple merge

diff --cc jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
Simple merge

diff --cc jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
Simple merge

diff --cc jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
Simple merge

diff --cc jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
Simple merge

diff --cc jjb/sdc/sdc-sdc-workflow-designer.yaml
Simple merge

diff --cc jjb/usecaseui/usecase-ui.yaml
Simple merge

diff --cc jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
Simple merge