Cherry pick nsx update, switch to stable branch for charm-helpers
[james-page,r=gnuoy] Cherry pick nsx update, switch to stable branch for charm-helpers