Bug 952912 - Check for update is on even for NOFTU builds.
Bug 971605 - Gaiatest can not restart b2g process on hamachi
Merge pull request #16109 from desaintmartin/952912

Bug 952912 - System update check for NOFTU build, r=alive
Bug 971621 - remove unnecessary code in build/applications-data.js for settings refactoring
Merge pull request #16200 from askeing/971605

Bug 971605 - Gaiatest can not restart b2g process on hamachi
Bug 971640 - Disable all python clock tests until intermittents resolved.
Merge pull request #16203 from yurenju/settings-blackhole

Bug 971621 - remove unnecessary code in build/applications-data.js for s... r=@timdream
Bug 968690 - Add Makefile for sms app