Cherry-pick the following commits from master:

* Remove 'DatatableOptions' from 'Compose Service' form tabs.
  Ibbba6c360ea46e9164cf326adeedd49ee531bd07
  Closes-bug: #1260312
* Fix issues with namings
  I86a2352fd936991552e9e4355a997c3b479f3f8a
* Fix message about images when there is no any
  Ibfc8622a86065ea8ecd5d6d9e5e49ff34567c5d1
* Fix showing Services list based on available images.
  I518f295930400486f9735d8b23c8ec39af1008cd

This fixes affect user interface (and jump up to the eyes), so they
are better included in release-0.4.

Change-Id: Idea24e356fca65039fdf0ca86aafbef9eba2fb0e
Merge "Cherry-pick the following commits from master:" into release-0.4