Removed always and only validate option, replaced with only_validate option....

Removed always and only validate option, replaced with only_validate option. To always validate, simply don't turn off p1 validation. 



Former-commit-id: b4437aeff12f304b5e748a7f39b31fd22a97052a