TRUNK-4373 Maven war plugin WebappStructure error

(cherry picked from commit c772ec2b68f394c5779cc8ac6771ae49ce08fa12)

Conflicts:
	webapp/pom.xml