[Merge] lp:~roadmr/ubuntu/trusty/checkbox-ng/bug-1284291 into lp:ubuntu/checkbox-ng

[Dmitry Shachnev]

Subscribing Sylvain, who can commit this to DPMT SVN (as well as Matthias' change), so that we are back in sync.
-- 
https://code.launchpad.net/~roadmr/ubuntu/trusty/checkbox-ng/bug-1284291/+merge/208017
Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~roadmr/ubuntu/trusty/checkbox-ng/bug-1284291 into lp:ubuntu/checkbox-ng.