Nkupdates

Nigel Kukardrequested to merge
nkukard/salt:nkupdates into master

Merge request reports