NMS-5982 Clean up NCS packaging.
Merge branch '1.12'