Merge "Change flag from -includekeyvalue to -keyvalue/-nokeyvalue" into oc-dev