Merge "fix entries for vnfsdk/model and dmaap/dbcapi in conf.py and related files"