remove '+' from kernel localversion
bring in changes for Mini 2 (based on 3.0 port)