Bring in fixed maven files into the trunk. - #4

Bring in fixed maven files into the trunk.#4

plbogen wants to merge 2 commits into

TeamCohen:masterTeamCohen/MinorThird:masterfrom

plbogen:masterplbogen/MinorThird:masterCopy head branch name to clipboard