Merge in 14.04 moderate_or_post fix (var rename will be done on 14.06 update

Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>