Update versioning

Fix: MN-2631
Ref: OS-90

Change-Id: I8402de1f476c0a5ecb710f8faeb15ff3c10a5a25
Merge "Update versioning"