Merge "Removing aai oxm files from configmaps"