Merged r11843 from trunk (#13910).
Adds markings to emails generated by private comments (#12888).
fix unit VersionTest failure
backout r11865 test/object_helpers.rb changes
Removed debug log (#14038).
Removed some shoulda context.
User #where instead of :conditions.