Merge pull request #495 from git-harry/sprint

Merged automatically by jenkins after successful gate test
Fixes issue TA135
Issue TA135
issue TA135
ISSUE TA135
Merge pull request #498 from rpedde/TA135

Merged automatically by jenkins after successful gate test
Allow ntp_servers to be settable

Issue DE89
Merge pull request #501 from andymcc/set_ntp

Merged automatically by jenkins after successful gate test