Fix bug where the base yaml wasn't being merged

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>