Implemented 4/28 reviewer comments.#1

rmoshiri wants to merge 2 commits intoopenemr:masteropenemr/translations_development_openemr:masterfrom

rmoshiri:masterrmoshiri/translations_development_openemr:masterCopy head branch name to clipboard