CDB-2959 checking overlay owner on controller
Merge branch 'CDB-2959' of https://github.com/CartoDB/cartodb into CDB-2959