This is a non binding resolution - it does fuck all. Both the conditions you mentioned are what we need, but based on my reading this resolution doesn't have any teeth to make anything actually happen.  Yes, they mention a bunch of grievances, but there is nothing in it to force the issue.