Merge "Updating (and completing) documentation post API-council changes." into mnc-dev