Skip database validation if attribute has already failed
Add missing new lines
Cleaning up some formatting and method names.
Merge branch '4.2'