Merge "Bug 820 fix - Unable to update NST via CLI"

No match.