Merge tag '1.2' into develop

Updated to allow override of denial functionality in cf-file-access.