Merge pull request #2823 from Conceptual-Design/RC0.7.3_master

Cross merge pull request #2800 to RC073
added filtering to hide internal classnames beginning with '_'
Prefixed double underscore to internal custom node names