Updated Save&Close and Save&AddAnother buttons, CORE-557
Updated code as per Anze's comment CORE-557
Merge pull request #1989 from reciprocity/hotfix/save-addmore-btn-fix--CORE-557

Updated Save&Close and Save&AddAnother buttons, CORE-557