Build changes associated with new 1.6 build script, now builds AMPs as well as JARs