Minor Refactoring
Updated keystore becuase of expired keys
Reverting keystore change as it is still failing in Jenkins
Merge branch 'master' into DS-890
Add order for staff as given by Lydia.