Bug 1186 - of-flow: pop-mpls-action different in config and operational data store

(cherry picked from commit 9a06086ce358a452e4de62b5f05dd849c770769b)
Conflicts:
	openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertor.java

Change-Id: I9b13cd917200504c24b2892590661a85824899cb
Signed-off-by: Anilkumar Vishnoi <avishnoi@in.ibm.com>
Signed-off-by: Michal Rehak <mirehak@cisco.com>