ARIES-311: Security updates and updates in obtaining the callers bundle context and passing it around as per spec