Only use scrollContainer for scrolling, not results
Merge branch 'master' into 3114-infinitescroll-manageaccess

Conflicts:
	shared/oae/js/jquery-plugins/jquery.infinitescroll.js
Merge branch 'master' into 3114-infinitescroll-manageaccess

Conflicts:
	shared/oae/js/jquery-plugins/jquery.infinitescroll.js
Merge pull request #3159 from nicolaasmatthijs/3114-infinitescroll-manageaccess

scrollContainer fix for infinite scroll
Disable tenant login button when the tenant is disabled
Merge pull request #3172 from nicolaasmatthijs/issue-3170-disable-login

Disable tenant login button when the tenant is disabled