Upgrade AWS

Conflicts:
	parent/pom.xml
Upgraded mustache