Merge "Adding optional aci-opflex hiera data"