Use plugin support classes and standard file names for capabilities bits
Merge branch 'master' into NEXUS-6027-kill-deprecated-code