1015944 - make sure we search for marketing products by cp_id

When the an engineering product is not foudn by cp_id, we still
want to give it a try for marketing products.
admin-role - static type for Role self_role and locked
Merge pull request #3101 from iNecas/bz/b1015944

1015944 - make sure we search for marketing products by cp_id
Merge pull request #3102 from thomasmckay/admin-role

admin-role - static type for Role self_role and locked
Bug #1016257 - fix ordering of modal dialog div, fixes #3077.
Merge pull request #3108 from waldenraines/bug-3077

Bug #1016257 - fix ordering of modal dialog div, fixes #3077.