of1x_pipeline_pp.h => function __of1x_process_packet_pipeline(): moving pkt->__cookie update into succeeding block
Merge branch 'akoepsel/devel-0.5/issue_rofl_40' into akoepsel/devel-0.6/issue_rofl_40

Conflicts:
	src/rofl/datapath/pipeline/openflow/openflow1x/pipeline/of1x_pipeline_pp.h