Merge pull request #2680 from pratik-joshi/CRM-13973-qa

CRM-13973-qa : a minor fix for -  selection form is submitted unchanged results a DB Error
CRM-13973-qa : fix for bug reported by coleman #comment-58354