[rpc2/f14/master] (12 commits) ...Merge branches 'f12', 'f13', 'f14' and 'el6'

[Adam Goode]

Summary of changes:

  55ea4dc... Initialize branch F-12 for rpc2 (*)
  05b2515... Fix typo that causes a failure to update the common directo (*)
  f9cebda... Fix typo that causes a failure to update the common directo (*)
  c1831b0... Initialize branch F-13 for rpc2 (*)
  0e4d28c... Initialize branch EL-6 for rpc2 (*)
  cd2852a... - New upstream release AES-CCM-16 was incorrectly named AES (*)
  485e5f8... - New upstream release AES-CCM-16 was incorrectly named AES (*)
  1e3941f... dist-git conversion (*)
  40d1de0... dist-git conversion (*)
  430aaf1... dist-git conversion (*)
  08f144f... Merge branch 'f12' into el6 (*)
  f485b81... Merge branches 'f12', 'f13', 'f14' and 'el6' (*)

(*) This commit already existed in another branch; no separate mail sent