Merge changes Id7ee1bd3,I5ea44a94 into sc-dev

* changes:
  [NS08] Expose public NetworkScore API
  [NS07] Add the rest of the scoring policy