Merge maint-4.0 into develop

Pull in latest maint-4.0 branch into develop to obtain 4.0.1 changes previously omitted in upcoming 4.1 release (see https://github.com/eucalyptus/eucaconsole/pull/1039)