No I would not. This is already addressed in section 11.6.1.2 (2), (3), and 11.6.3. The FDA also requires the supplier personnel who perform that function to be trained in accordance with the GMP's (21 CFR 211.25.

To your last question: if the training was documented by the company and the facility considers that documentation acceptable, then I would consider it compliant with NFPA 99, 2012 5.1.14.2.2.5(1).

As facilities management personnel become more educated in recent years, I'm seeing more concern/focus on this (from a liability standpoint).  I tell folks the simplest way to ensure compliance is to qualify their in-house personnel as 6040 and require documentation from all service providers they are qualified to do so.

But we all know the 6030 and 6040 -- two options permitted -- don't necessary make someone qualified to provide maintenance on source equipment or pipeline components (especially not compared to OEMs or their licensed service providers).  This is why I tell my folks to do their due diligence on who they hire and write their internal policies and procedures accordingly.