remove non core, non openhotel contrib dependencies.
Merge branch 'vci11' of https://github.com/maustyle/VCI-7.x-1.x into vci11

Conflicts:
	drupal-org.make