Merge remote-tracking branch 'origin' into future

Conflicts:
	snf-astakos-app/astakos/im/management/commands/group-list.py
	snf-astakos-app/astakos/im/management/commands/group-permissions-add.py
	snf-astakos-app/astakos/im/management/commands/group-permissions-remove.py
	snf-astakos-app/astakos/im/management/commands/group_list.py
	snf-astakos-app/astakos/im/management/commands/resource-list.py
	snf-astakos-app/astakos/im/management/commands/sendactivation.py
	snf-astakos-app/astakos/im/management/commands/service-renew-token.py
	snf-astakos-app/astakos/im/management/commands/service-token-renew.py
	snf-astakos-app/astakos/im/management/commands/service_renew_token.py
	snf-astakos-app/astakos/im/management/commands/user-activation-send.py
	snf-astakos-app/astakos/im/management/commands/user-modify.py
	snf-astakos-app/astakos/im/management/commands/user-send-activation.py