Agileware working version for 4.6

working-2018-release

Allow mailing id to be specified in JSON, fixes fatal error in mail test