MAVEN-63
MAVEN-62
MAVEN-62 Sort
MAVEN-58
MAVEN-58 Trailing space
MAVEN-64
MAVEN-65
MAVEN-66 removed unnecessary xml config
MAVEN-67 Fix compile error
MAVEN-67 SF
Update copyright to correct year