[PATCH 0/2] conf: Properly handle placement of <auth> and <encryption> after blockjobs