Merge "Minor fixes in md-sal and config."