fixes for CRM-14651 , refs #11858 , redirection.
Merge branch 'develop' of github.com:NETivism/netiCRM into develop