Merge "Fix nodeSlector and Affinity for aai charts"

diff --cc kubernetes/aai/charts/aai-babel/templates/deployment.yaml
Simple merge

diff --cc kubernetes/aai/charts/aai-champ/templates/deployment.yaml
Simple merge

diff --cc kubernetes/aai/charts/aai-gizmo/templates/deployment.yaml
Simple merge

diff --cc kubernetes/aai/charts/aai-graphadmin/templates/deployment.yaml
Simple merge

diff --cc kubernetes/aai/charts/aai-graphadmin/templates/job.yaml
Simple merge

diff --cc kubernetes/aai/charts/aai-resources/templates/deployment.yaml
Simple merge

diff --cc kubernetes/aai/charts/aai-sparky-be/templates/deployment.yaml
Simple merge

diff --cc kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
Simple merge