Merge branch 'release-7.x-0.2-rc3'
Added bootstrap.inc and removed mocks.inc which has become obsolete.
Version bumped from 7.x-0.2-rc3 to 7.x-0.2
Merge branch 'release-7.x-0.2'