Include SAVANNA_CONF_DIR into SAVANNA_CONF_FILE

It's the commom way of using X_CONF_FILE variable.

Change-Id: Ibc284be44ffdd25be3191913c78424cbf06b2bb0
Stop all neutron-ns-metadata-proxy with stop_neutron

Process name is actually python therefore neutron-ns-metadata-proxy
pattern didn't match wanted process.

Closes-bug: #1269982
Change-Id: Ib4439b0d32f103253b461841fa903c65763ff280
Merge "Include SAVANNA_CONF_DIR into SAVANNA_CONF_FILE"
Merge "Stop all neutron-ns-metadata-proxy with stop_neutron"