Prepare for EAP 6.4

Do not merge yet, this is a work in progress.
>Irrelevant, we are talking syncing with EAP 6.4 here.

very relevant, see my comment below. This changes the whole purpose of this BOM.