Allow refreshing of the initialization wizard final page - TRUNK-2022
Applied review comment - TRUNK-2022
Display the inherited roles when searching for users by role under User
Management - TRUNK-3717

Revisited users list to limit the number of displayed roles -
TRUNK-3717

Follow up to use css for inherited roles to be displayed in italics -
TRUNK-3717
Changed by information not updated when concept names/synonyms are
edited, added or removed - TRUNK-3337(cherry picked from commit d5c478a3a425d19ca75441ac78de64dd12ef3b6a)
TRUNK-3284: Improve the current locale choice for concept management
page
(cherry picked from commit 0029be04cc280e9a38a7d436ca3e61ce0731458b)

Resolved conflicts:

	webapp/src/main/webapp/openmrs.css
TRUNK-3284: resolved conflict
TRUNK-3753: Uses the c:url tag to provide support for external urls, javascript, and local urls (by adding the context path).
(cherry picked from commit d0f269ef0f200215bbcf6c0b45d9b02146ff2e21)
TRUNK-3610:Global Property autoCloseVisits.visitType should start with
"visits"

(cherry picked from commit ee2d1c6)
Fixed formatting
TRUNK-3693: Correct web.xml build date to be locale independent
(cherry picked from commit d77af242bee13ea218558421c08e2ba47e542c24)
TRUNK-3363: synchronize refreshingContextCheck on separate refreshingContextLock object
(cherry picked from commit 74cd4e18641f028aa93ab11add98a0b5ec2882c9)
TRUNK-3280:Short patient form should display Relationships only if the
showRelationships GP is set to true
(cherry picked from commit ffe6f8e47642b25a4943cf15a00f0ca5f9523ebd)
TRUNK-3404:Make retired Encounter Types more visible on Add Encounter
form

minor changes
(cherry picked from commit 16051c862fdabe4e3a6acb36a60004b52dcb8e2d)
TRUNK-2547:Warnings reported by SerializedObjectDAOTest(cherry picked from commit 38829a43ee4721fad5413ebad7949eb8f8c5e83c)
TRUNK-3664:Unable to remove a synonym from the edit concept page if the
synonym is blank
(cherry picked from commit de5ae730232f93baa2eb09be58c27f262d337d14)
TRUNK-3651: allow the email format as a valid username
(cherry picked from commit 07717c1721a2fd2783bc2a214fdba63eaad44e77)
TRUNK-2681: Added the NewPassword and ConfirmPassword verification
(cherry picked from commit bd42f7d591b91af32bc29a99ad2786fa57b5a5f6)
Fixed formatting
TRUNK-3287:Incorrect date_created value on edited concept names

TRUNK-3287: set date and creator to null and let the handlers do the
work

Unit test added
(cherry picked from commit d09c3eae36ad57071b141a96bc3edee328b1c5f9)
TRUNK-3712:Allow duplicate reference term names(cherry picked from commit 9c21656f2054371d3a664da386cfd1f05e9d49f8)