Merge changes I975a9439,Idec1fe8e into sc-dev

* changes:
  [NS04.5] Have NetworkOffer embark a provider ID
  [NS04] Introduce Network Offers and their callbacks