fixing more tenant binding misconfigurations; xml blocks were misplaced in several other locations