Merge pull request #14390 from huoxito/true-touch

Still touch associations when theres no timestamp
Use rails conventions