Clean up stack.sh and unstack.sh; move in-line contrail specific code to third part area