CORE-165 - OpenFlow function now checks if EditingToken is empty, if it is does not change it.