Import changes from upstream (gitorious/mainline) sample config file