Merge "Add Pluggable Security to aai-resources"