I fixed a few issues brought up during a second code review with Diego. Thus, all merge requirements I know of are fulfilled and this branch seems fit for merging. -- https://code.launchpad.net/~stefan.goetz/hipl/fw-cache-port-cleanup/+merge/39235 Your team HIPL core team is requested to review the proposed merge of lp:~stefan.goetz/hipl/fw-cache-port-cleanup into lp:hipl.