Updated all instances of where we make use of Faan's old credentials
removed out and old_spec folders
Merge branch 'develop' into uat