Reworked query.promote_joins() call to work with Django 1.5-1.6 and 1.7 ...

...(which drops the unconditional arg)