Fixed compilation errors caused by rebase/merge issues.
config side dirty fix needed to make config start after rebasing sss branch to release-4.6 (george's suggestion). Should be reverted and a  proper fix done.