Merge branches 'users/hare/SLE15-SP2/for-next', 'users/msuchanek/SLE15-SP2/for-next' and 'users/oneukum/SLE15-SP2/for-next' into SLE15-SP2
Pull a block layer fix from Hannes Reinecke.
Pull an upstream reference update from Michal Suchánek.
Pull nfc fixes from Oliver Neukum.