Make change and version bump to OPR6.170623.018

Change-Id: I776f6e6bd3aedc2b7293b8cd204113ef25ced227