TRUNK-4373 Maven war plugin WebappStructure error

(cherry picked from commit c772ec2b68f394c5779cc8ac6771ae49ce08fa12)
TRUNK-287 ConceptService needs to strip trailing whitespace before searching or saving concept names

(cherry picked from commit 6a8020e7b74b19788d55bd4ffac34e6c4bfea611)