[data processing] Make sahara permission check backwards compatible

[Lin Hua Cheng]

The permission checked was changed in: https://bugs.launchpad.net/horizon/+bug/1429987

FROM:
permissions = ('openstack.services.data_processing',)

TO:
permissions = ('openstack.services.data-processing',)

The change is not backwards compatible. Needs to be updated to do an OR to check for both

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/165644

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/165644
Committed: https://git.openstack.org/cgit/openstack/horizon/commit/?id=30d4b6d1f95ece8eba9522e7e3d34b981c41bfc9
Submitter: Jenkins
Branch: master

commit 30d4b6d1f95ece8eba9522e7e3d34b981c41bfc9
Author: lin-hua-cheng <email address hidden>
Date: Wed Mar 18 16:08:59 2015 -0700

    Make sahara permission check backward compatible

    In kilo, the service type of sahara changed from data_processing
    to data-processing.

    We should be checking for both data-processing and data_processing
    service for backward compatability.

    Change-Id: I6f55938b7c9dedcacc2fd6ba27c14ecc4e8565e3
    Closes-Bug: #1433816