Angshu/Shruthi | Enhancing SourceMySqldiffFile to be used from command line
Merge pull request #466 from shruthidipali/sqldiff

Sqldiff
TRUNK-2694 Fix Performance hog: Maps and sets of URLs

(cherry picked from commit 358de98ed9954c3eb0b9b31031f7dffe0ee8a9b1)

manually added missing imports
TRUNK-4209: Fix N+1 select issues on Concept subentities
TRUNK-4210 | Upgrading mysql-connector-java version to 5.1.28
Merge pull request #506 from vinkesh/4210

TRUNK-4210 | Upgrading mysql-connector-java version to 5.1.28
Merge pull request #505 from endeepak/TRUNK-4209

TRUNK-4209: Fix N+1 select issues on Concept subentities
TRUNK-4164 Obs.getValueAsString(Locale locale) should localize name if Obs is valueCoded
Merge pull request #510 from pawelskij/TRUNK-4164

TRUNK-4164 Obs.getValueAsString(Locale locale) should localize name if O...
Doing some formatting
Sonar blocker: obj could be null and is guaranteed to be dereferenced in
org.openmrs.validator.UserValidator.validate - TRUNK-4199
Formatting the SourceMySqldiffFile.java
TRUNK-2157: Legacy theme: Improper OpenMRS logo link
TRUNK-4212 Ignoring unstable tests in SchedulerServiceTest

(cherry picked from commit 38120f112be439d246cca24a3b1031c7be7046b2)
TRUNK-3974: ConceptNumeric(concept) incorrectly copies collections
Merge pull request #535 from lrozanski/TRUNK-3974

TRUNK-3974: ConceptNumeric(concept) incorrectly copies collections
TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list
Merge pull request #547 from lrozanski/TRUNK-3898

TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list