More updates for enhancement 1084.
Merge branch 'master' of github.com:RaytheonWebSolutions/globe-gov-workshop3-portlet