Merge "Allow specifying a network for SNTP time sync" into pi-dev