Cleanning BOM mess

Change-Id: Ife93b3bf4f537b90acb33a8603ca30a79316d4bd
Merge branch 'master' of gitorious:scalability/rabbit-hare

* 'master' of gitorious:scalability/rabbit-hare:
  Cleanning BOM mess