Fix for pad.lv/1489477.
Fix for pad.lv/1489477.

Introduce new m4 class types for AWS.

dooferlad/juju,axw/juju,gabriel-samfira/juju,anastasiamac/juju,bac/juju,AdamIsrael/juju,kat-co/juju,axw/juju,bac/juju,mjs/juju,axw/juju,alesstimec/juju,ericsnowcurrently/juju,frankban/juju,makyo/juju,ericsnowcurrently/juju,axw/juju,bac/juju,davecheney/juju,bz2/juju,dooferlad/juju,howbazaar/juju,fwereade/juju,voidspace/juju,davecheney/juju,davecheney/juju,waigani/juju,dimitern/juju,gabriel-samfira/juju,gabriel-samfira/juju,mjs/juju,anastasiamac/juju,kat-co/juju,bz2/juju,mikemccracken/juju,mikemccracken/juju,frankban/juju,gabriel-samfira/juju,fwereade/juju,bz2/juju,bz2/juju,wwitzel3/juju,marcmolla/juju,macgreagoir/juju,davecheney/juju,perrito666/juju,wwitzel3/juju,mjs/juju,makyo/juju,bac/juju,marcmolla/juju,macgreagoir/juju,bogdanteleaga/juju,kat-co/juju,reedobrien/juju,anastasiamac/juju,waigani/juju,perrito666/juju,mjs/juju,bac/juju,bogdanteleaga/juju,dooferlad/juju,alesstimec/juju,alesstimec/juju,reedobrien/juju,gabriel-samfira/juju,ericsnowcurrently/juju,bogdanteleaga/juju,axw/juju,frankban/juju,voidspace/juju,perrito666/juju,dimitern/juju,wwitzel3/juju,reedobrien/juju,marcmolla/juju,mjs/juju,dimitern/juju,AdamIsrael/juju,marcmolla/juju,howbazaar/juju,mikemccracken/juju,bz2/juju,marcmolla/juju,mjs/juju,AdamIsrael/juju,fwereade/juju,kat-co/juju,makyo/juju,reedobrien/juju,voidspace/juju,makyo/juju,dooferlad/juju,frankban/juju,anastasiamac/juju,mikemccracken/juju,dimitern/juju,frankban/juju,howbazaar/juju,waigani/juju,howbazaar/juju,mjs/juju,alesstimec/juju,alesstimec/juju,wwitzel3/juju,anastasiamac/juju,macgreagoir/juju,waigani/juju,macgreagoir/juju,dimitern/juju,reedobrien/juju,macgreagoir/juju,perrito666/juju,fwereade/juju,perrito666/juju,kat-co/juju,mikemccracken/juju,AdamIsrael/juju,voidspace/juju,howbazaar/juju,dooferlad/juju,bogdanteleaga/juju,ericsnowcurrently/juju,ericsnowcurrently/juju