fix stand-alone validator - using the '@rules' from the wrong scope
Merge branch 'Raven24-self-contained-fix' into develop