CDB-1419 #resolve - rendering flash message in the correct block, or oauth or api_key
Merge CDB-1419 into release/2.8.3