Merge "conf.py: deal siteconf when set in init"