Updated keystore becuase of expired keys
Reverting keystore change as it is still failing in Jenkins
[DS-951] Refactor PropLoader to Property for acceptance tests
Updated ciKeyStore with new certificate
Removing extraneous characters in rake task
Adding new cert to ciKeyStore.jks
Uploading new ciKeyStore.jks
Another new ciKeyStore.jks
Updating local KeyStore
IS-837 Update wildcard certificate to self signed
IS-837 updating trust store with self signed cert
IS-837 put the cert in all the places
Append time to cats_with_lasers for acceptance tests
Merge branch 'master' into ssl_error

Conflicts:
	sli/data-access/dal/keyStore/ciKeyStore.jks
Make git ignore all cats with lasers
Merge branch 'master' into ssl_error
fixed error in api odin test
[DS-965] Get Odin tests working

    - Fix discipline incident spec
    - Fix and clean pre-requisite builder spec
    - Fix and clean world builder spec
    - Clean and fix Odin integration spec
    - Update baseline XML files
    - Update baseline for InterchangeEducationOrgCalendar.xml (plus refactoring to idiomatic ruby)
    - Update baseline expected XML
    - Interim commit
    - Minor improvements to spec
    - Fix specs since Session requires passing calendar_dates on new
    - Attendance generator spec no longer expects AttendanceEventType
Merge branch 'master' into java-upgrade